From 5e21a413c788f839a66d9e4c14e745ed18058db8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 25 Feb 2014 21:31:58 +0100 Subject: cppuhelper: retrofit std::exception into overriding exception specs Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3 --- UnoControls/inc/basecontainercontrol.hxx | 28 +- UnoControls/inc/basecontrol.hxx | 98 +-- UnoControls/inc/multiplexer.hxx | 48 +- UnoControls/source/base/basecontainercontrol.cxx | 28 +- UnoControls/source/base/basecontrol.cxx | 94 +-- UnoControls/source/base/multiplexer.cxx | 48 +- .../controls/OConnectionPointContainerHelper.cxx | 10 +- .../source/controls/OConnectionPointHelper.cxx | 12 +- UnoControls/source/controls/framecontrol.cxx | 30 +- UnoControls/source/controls/progressbar.cxx | 22 +- UnoControls/source/controls/progressmonitor.cxx | 46 +- UnoControls/source/controls/statusindicator.cxx | 32 +- .../source/inc/OConnectionPointContainerHelper.hxx | 10 +- UnoControls/source/inc/OConnectionPointHelper.hxx | 12 +- UnoControls/source/inc/framecontrol.hxx | 30 +- UnoControls/source/inc/progressbar.hxx | 22 +- UnoControls/source/inc/progressmonitor.hxx | 46 +- UnoControls/source/inc/statusindicator.hxx | 32 +- .../accessibility/extended/AccessibleBrowseBox.hxx | 12 +- .../extended/AccessibleBrowseBoxBase.hxx | 50 +- .../extended/AccessibleBrowseBoxCheckBoxCell.hxx | 18 +- .../extended/AccessibleBrowseBoxHeaderBar.hxx | 48 +- .../extended/AccessibleBrowseBoxHeaderCell.hxx | 10 +- .../extended/AccessibleBrowseBoxTable.hxx | 30 +- .../extended/AccessibleBrowseBoxTableBase.hxx | 28 +- .../extended/AccessibleBrowseBoxTableCell.hxx | 48 +- .../extended/AccessibleGridControl.hxx | 14 +- .../extended/AccessibleGridControlBase.hxx | 44 +- .../extended/AccessibleGridControlHeader.hxx | 32 +- .../extended/AccessibleGridControlHeaderCell.hxx | 14 +- .../extended/AccessibleGridControlTable.hxx | 46 +- .../extended/AccessibleGridControlTableBase.hxx | 28 +- .../extended/AccessibleGridControlTableCell.hxx | 48 +- .../extended/AccessibleToolPanelDeck.hxx | 12 +- .../extended/AccessibleToolPanelDeckTabBar.hxx | 10 +- .../extended/AccessibleToolPanelDeckTabBarItem.hxx | 30 +- .../extended/accessiblebrowseboxcell.hxx | 2 +- .../extended/accessibleeditbrowseboxcell.hxx | 28 +- .../extended/accessibleiconchoicectrl.hxx | 34 +- .../extended/accessibleiconchoicectrlentry.hxx | 96 +-- .../accessibility/extended/accessiblelistbox.hxx | 34 +- .../extended/accessiblelistboxentry.hxx | 118 ++-- .../accessibility/extended/accessibletabbar.hxx | 42 +- .../extended/accessibletabbarpage.hxx | 42 +- .../extended/accessibletabbarpagelist.hxx | 56 +- .../extended/accessibletablistbox.hxx | 6 +- .../extended/accessibletablistboxtable.hxx | 16 +- .../accessibility/extended/listboxaccessible.hxx | 2 +- .../extended/textwindowaccessibility.hxx | 112 ++-- .../standard/accessiblemenubasecomponent.hxx | 6 +- .../standard/accessiblemenucomponent.hxx | 46 +- .../standard/accessiblemenuitemcomponent.hxx | 32 +- .../accessibility/standard/vclxaccessiblebox.hxx | 26 +- .../standard/vclxaccessiblebutton.hxx | 22 +- .../standard/vclxaccessiblecheckbox.hxx | 20 +- .../standard/vclxaccessiblecombobox.hxx | 4 +- .../standard/vclxaccessibledropdowncombobox.hxx | 4 +- .../standard/vclxaccessibledropdownlistbox.hxx | 4 +- .../accessibility/standard/vclxaccessibleedit.hxx | 66 +- .../standard/vclxaccessiblefixedhyperlink.hxx | 4 +- .../standard/vclxaccessiblefixedtext.hxx | 4 +- .../accessibility/standard/vclxaccessiblelist.hxx | 34 +- .../standard/vclxaccessiblelistbox.hxx | 4 +- .../standard/vclxaccessiblelistitem.hxx | 90 +-- .../accessibility/standard/vclxaccessiblemenu.hxx | 28 +- .../standard/vclxaccessiblemenubar.hxx | 10 +- .../standard/vclxaccessiblemenuitem.hxx | 56 +- .../standard/vclxaccessiblemenuseparator.hxx | 6 +- .../standard/vclxaccessiblepopupmenu.hxx | 10 +- .../standard/vclxaccessibleradiobutton.hxx | 20 +- .../standard/vclxaccessiblescrollbar.hxx | 22 +- .../standard/vclxaccessiblestatusbar.hxx | 10 +- .../standard/vclxaccessiblestatusbaritem.hxx | 56 +- .../standard/vclxaccessibletabcontrol.hxx | 26 +- .../standard/vclxaccessibletabpage.hxx | 56 +- .../standard/vclxaccessibletabpagewindow.hxx | 4 +- .../standard/vclxaccessibletextcomponent.hxx | 34 +- .../standard/vclxaccessibletextfield.hxx | 14 +- .../standard/vclxaccessibletoolbox.hxx | 24 +- .../standard/vclxaccessibletoolboxitem.hxx | 70 +- .../source/extended/AccessibleBrowseBox.cxx | 12 +- .../source/extended/AccessibleBrowseBoxBase.cxx | 50 +- .../extended/AccessibleBrowseBoxCheckBoxCell.cxx | 18 +- .../extended/AccessibleBrowseBoxHeaderBar.cxx | 48 +- .../extended/AccessibleBrowseBoxHeaderCell.cxx | 10 +- .../source/extended/AccessibleBrowseBoxTable.cxx | 30 +- .../extended/AccessibleBrowseBoxTableBase.cxx | 28 +- .../extended/AccessibleBrowseBoxTableCell.cxx | 48 +- .../source/extended/AccessibleGridControl.cxx | 14 +- .../source/extended/AccessibleGridControlBase.cxx | 44 +- .../extended/AccessibleGridControlHeader.cxx | 32 +- .../extended/AccessibleGridControlHeaderCell.cxx | 14 +- .../source/extended/AccessibleGridControlTable.cxx | 46 +- .../extended/AccessibleGridControlTableBase.cxx | 28 +- .../extended/AccessibleGridControlTableCell.cxx | 48 +- .../source/extended/AccessibleToolPanelDeck.cxx | 12 +- .../extended/AccessibleToolPanelDeckTabBar.cxx | 12 +- .../extended/AccessibleToolPanelDeckTabBarItem.cxx | 30 +- .../source/extended/accessiblebrowseboxcell.cxx | 2 +- .../extended/accessibleeditbrowseboxcell.cxx | 28 +- .../source/extended/accessibleiconchoicectrl.cxx | 34 +- .../extended/accessibleiconchoicectrlentry.cxx | 96 +-- .../source/extended/accessiblelistbox.cxx | 34 +- .../source/extended/accessiblelistboxentry.cxx | 118 ++-- accessibility/source/extended/accessibletabbar.cxx | 42 +- .../source/extended/accessibletabbarpage.cxx | 42 +- .../source/extended/accessibletabbarpagelist.cxx | 56 +- .../source/extended/accessibletablistbox.cxx | 6 +- .../source/extended/accessibletablistboxtable.cxx | 16 +- .../source/extended/textwindowaccessibility.cxx | 112 ++-- .../standard/accessiblemenubasecomponent.cxx | 6 +- .../source/standard/accessiblemenucomponent.cxx | 46 +- .../standard/accessiblemenuitemcomponent.cxx | 32 +- .../source/standard/vclxaccessiblebox.cxx | 26 +- .../source/standard/vclxaccessiblebutton.cxx | 22 +- .../source/standard/vclxaccessiblecheckbox.cxx | 20 +- .../source/standard/vclxaccessiblecombobox.cxx | 4 +- .../standard/vclxaccessibledropdowncombobox.cxx | 4 +- .../standard/vclxaccessibledropdownlistbox.cxx | 4 +- .../source/standard/vclxaccessibleedit.cxx | 66 +- .../standard/vclxaccessiblefixedhyperlink.cxx | 4 +- .../source/standard/vclxaccessiblefixedtext.cxx | 4 +- .../source/standard/vclxaccessiblelist.cxx | 32 +- .../source/standard/vclxaccessiblelistbox.cxx | 4 +- .../source/standard/vclxaccessiblelistitem.cxx | 90 +-- .../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 | 56 +- .../source/standard/vclxaccessibletabcontrol.cxx | 26 +- .../source/standard/vclxaccessibletabpage.cxx | 56 +- .../standard/vclxaccessibletabpagewindow.cxx | 4 +- .../standard/vclxaccessibletextcomponent.cxx | 34 +- .../source/standard/vclxaccessibletextfield.cxx | 14 +- .../source/standard/vclxaccessibletoolbox.cxx | 32 +- .../source/standard/vclxaccessibletoolboxitem.cxx | 72 +- animations/source/animcore/animcore.cxx | 436 ++++++------ .../source/animcore/targetpropertiescreator.cxx | 20 +- avmedia/source/framework/soundhandler.cxx | 18 +- avmedia/source/framework/soundhandler.hxx | 22 +- avmedia/source/gstreamer/gstframegrabber.cxx | 8 +- avmedia/source/gstreamer/gstframegrabber.hxx | 8 +- avmedia/source/gstreamer/gstmanager.cxx | 8 +- avmedia/source/gstreamer/gstmanager.hxx | 8 +- avmedia/source/gstreamer/gstplayer.cxx | 38 +- avmedia/source/gstreamer/gstplayer.hxx | 38 +- avmedia/source/gstreamer/gstwindow.cxx | 54 +- avmedia/source/gstreamer/gstwindow.hxx | 54 +- avmedia/source/viewer/mediaevent_impl.cxx | 22 +- avmedia/source/viewer/mediaevent_impl.hxx | 22 +- avmedia/source/vlc/vlcframegrabber.cxx | 8 +- avmedia/source/vlc/vlcframegrabber.hxx | 8 +- avmedia/source/vlc/vlcmanager.cxx | 8 +- avmedia/source/vlc/vlcmanager.hxx | 8 +- avmedia/source/vlc/vlcplayer.cxx | 38 +- avmedia/source/vlc/vlcplayer.hxx | 38 +- avmedia/source/vlc/vlcwindow.cxx | 54 +- avmedia/source/vlc/vlcwindow.hxx | 54 +- .../accessibility/accessibledialogcontrolshape.cxx | 46 +- .../accessibility/accessibledialogwindow.cxx | 54 +- basctl/source/basicide/basicrenderable.cxx | 6 +- basctl/source/basicide/basicrenderable.hxx | 6 +- basctl/source/basicide/baside2b.cxx | 4 +- basctl/source/basicide/basidectrlr.cxx | 8 +- basctl/source/basicide/basidesh.cxx | 8 +- basctl/source/basicide/doceventnotifier.cxx | 8 +- basctl/source/basicide/moduldl2.cxx | 10 +- basctl/source/basicide/unomodel.cxx | 16 +- basctl/source/basicide/unomodel.hxx | 18 +- basctl/source/dlged/dlgedclip.cxx | 8 +- basctl/source/dlged/dlgedlist.cxx | 12 +- basctl/source/inc/accessibledialogcontrolshape.hxx | 46 +- basctl/source/inc/accessibledialogwindow.hxx | 54 +- basctl/source/inc/basidectrlr.hxx | 8 +- basctl/source/inc/dlgedclip.hxx | 8 +- basctl/source/inc/dlgedlist.hxx | 12 +- basegfx/source/tools/unopolypolygon.cxx | 36 +- basic/source/basmgr/basmgr.cxx | 150 ++--- basic/source/basmgr/vbahelper.cxx | 8 +- basic/source/classes/errobject.cxx | 52 +- basic/source/classes/eventatt.cxx | 12 +- basic/source/classes/propacc.cxx | 24 +- basic/source/classes/sb.cxx | 12 +- basic/source/classes/sbunoobj.cxx | 72 +- basic/source/classes/sbxmod.cxx | 60 +- basic/source/inc/dlgcont.hxx | 10 +- basic/source/inc/namecont.hxx | 144 ++-- basic/source/inc/propacc.hxx | 24 +- basic/source/inc/scriptcont.hxx | 22 +- basic/source/runtime/comenumwrapper.cxx | 4 +- basic/source/runtime/comenumwrapper.hxx | 4 +- basic/source/uno/dlgcont.cxx | 10 +- basic/source/uno/namecont.cxx | 138 ++-- basic/source/uno/scriptcont.cxx | 22 +- binaryurp/source/bridge.cxx | 12 +- binaryurp/source/bridge.hxx | 12 +- binaryurp/source/bridgefactory.cxx | 10 +- binaryurp/source/bridgefactory.hxx | 10 +- 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 | 88 +-- canvas/source/cairo/cairo_spritecanvas.cxx | 6 +- canvas/source/cairo/cairo_spritecanvas.hxx | 6 +- canvas/source/cairo/cairo_textlayout.cxx | 40 +- canvas/source/cairo/cairo_textlayout.hxx | 40 +- canvas/source/factory/cf_service.cxx | 32 +- canvas/source/opengl/ogl_canvascustomsprite.cxx | 16 +- 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 | 12 +- canvas/source/opengl/ogl_spritecanvas.hxx | 12 +- canvas/source/opengl/ogl_textlayout.cxx | 34 +- canvas/source/opengl/ogl_textlayout.hxx | 34 +- canvas/source/simplecanvas/simplecanvasimpl.cxx | 40 +- canvas/source/tools/cachedprimitivebase.cxx | 8 +- canvas/source/tools/canvastools.cxx | 88 +-- 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 | 6 +- canvas/source/vcl/spritecanvas.hxx | 6 +- canvas/source/vcl/textlayout.cxx | 40 +- canvas/source/vcl/textlayout.hxx | 40 +- chart2/inc/ChartModel.hxx | 154 ++--- chart2/inc/ChartView.hxx | 42 +- .../controller/accessibility/AccessibleBase.cxx | 48 +- .../accessibility/AccessibleChartElement.cxx | 30 +- .../accessibility/AccessibleChartElement.hxx | 30 +- .../accessibility/AccessibleChartShape.cxx | 36 +- .../accessibility/AccessibleChartShape.hxx | 36 +- .../accessibility/AccessibleChartView.cxx | 20 +- .../accessibility/AccessibleTextHelper.cxx | 22 +- .../controller/chartapiwrapper/AreaWrapper.cxx | 16 +- .../controller/chartapiwrapper/AreaWrapper.hxx | 16 +- .../controller/chartapiwrapper/AxisWrapper.cxx | 26 +- .../controller/chartapiwrapper/AxisWrapper.hxx | 26 +- .../chartapiwrapper/ChartDataWrapper.cxx | 48 +- .../chartapiwrapper/ChartDataWrapper.hxx | 48 +- .../chartapiwrapper/ChartDocumentWrapper.cxx | 58 +- .../chartapiwrapper/DataSeriesPointWrapper.cxx | 20 +- .../chartapiwrapper/DataSeriesPointWrapper.hxx | 20 +- .../controller/chartapiwrapper/DiagramWrapper.cxx | 96 +-- .../controller/chartapiwrapper/DiagramWrapper.hxx | 96 +-- .../controller/chartapiwrapper/GridWrapper.cxx | 6 +- .../controller/chartapiwrapper/GridWrapper.hxx | 6 +- .../controller/chartapiwrapper/LegendWrapper.cxx | 16 +- .../controller/chartapiwrapper/LegendWrapper.hxx | 16 +- .../chartapiwrapper/MinMaxLineWrapper.cxx | 44 +- .../chartapiwrapper/MinMaxLineWrapper.hxx | 44 +- .../controller/chartapiwrapper/TitleWrapper.cxx | 30 +- .../controller/chartapiwrapper/TitleWrapper.hxx | 30 +- .../chartapiwrapper/UpDownBarWrapper.cxx | 44 +- .../chartapiwrapper/UpDownBarWrapper.hxx | 44 +- .../chartapiwrapper/WallFloorWrapper.cxx | 6 +- .../chartapiwrapper/WallFloorWrapper.hxx | 6 +- .../controller/dialogs/RangeSelectionListener.cxx | 6 +- .../controller/dialogs/dlg_ChartType_UNO.cxx | 8 +- .../controller/dialogs/dlg_CreationWizard_UNO.cxx | 34 +- chart2/source/controller/inc/AccessibleBase.hxx | 54 +- .../source/controller/inc/AccessibleChartView.hxx | 20 +- .../source/controller/inc/AccessibleTextHelper.hxx | 22 +- .../source/controller/inc/ChartDocumentWrapper.hxx | 58 +- .../controller/inc/RangeSelectionListener.hxx | 6 +- chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 8 +- .../controller/inc/dlg_CreationWizard_UNO.hxx | 34 +- chart2/source/controller/main/ChartController.cxx | 48 +- chart2/source/controller/main/ChartController.hxx | 90 +-- .../controller/main/ChartController_Window.cxx | 42 +- chart2/source/controller/main/ChartFrameloader.cxx | 4 +- chart2/source/controller/main/ChartFrameloader.hxx | 4 +- chart2/source/controller/main/CommandDispatch.cxx | 10 +- chart2/source/controller/main/CommandDispatch.hxx | 10 +- .../controller/main/ControllerCommandDispatch.cxx | 8 +- .../controller/main/ControllerCommandDispatch.hxx | 8 +- .../source/controller/main/DrawCommandDispatch.cxx | 2 +- .../source/controller/main/DrawCommandDispatch.hxx | 2 +- chart2/source/controller/main/ElementSelector.cxx | 8 +- chart2/source/controller/main/ElementSelector.hxx | 8 +- .../controller/main/FeatureCommandDispatchBase.cxx | 2 +- .../controller/main/FeatureCommandDispatchBase.hxx | 2 +- chart2/source/controller/main/ShapeController.cxx | 2 +- chart2/source/controller/main/ShapeController.hxx | 2 +- .../controller/main/ShapeToolbarController.cxx | 22 +- .../controller/main/ShapeToolbarController.hxx | 22 +- .../controller/main/StatusBarCommandDispatch.cxx | 8 +- .../controller/main/StatusBarCommandDispatch.hxx | 8 +- chart2/source/controller/main/UndoActions.cxx | 12 +- chart2/source/controller/main/UndoActions.hxx | 12 +- .../source/controller/main/UndoCommandDispatch.cxx | 4 +- .../source/controller/main/UndoCommandDispatch.hxx | 4 +- chart2/source/inc/CachedDataSequence.hxx | 22 +- chart2/source/inc/ConfigColorScheme.hxx | 2 +- chart2/source/inc/DataSource.hxx | 4 +- chart2/source/inc/ErrorBar.hxx | 36 +- .../inc/ExponentialRegressionCurveCalculator.hxx | 6 +- chart2/source/inc/InternalDataProvider.hxx | 84 +-- chart2/source/inc/LabeledDataSequence.hxx | 14 +- .../source/inc/LinearRegressionCurveCalculator.hxx | 4 +- .../inc/LogarithmicRegressionCurveCalculator.hxx | 6 +- .../inc/MeanValueRegressionCurveCalculator.hxx | 6 +- chart2/source/inc/ModifyListenerHelper.hxx | 8 +- .../inc/MovingAverageRegressionCurveCalculator.hxx | 6 +- chart2/source/inc/NameContainer.hxx | 24 +- chart2/source/inc/OPropertySet.hxx | 30 +- .../inc/PolynomialRegressionCurveCalculator.hxx | 6 +- .../inc/PotentialRegressionCurveCalculator.hxx | 6 +- chart2/source/inc/RangeHighlighter.hxx | 10 +- chart2/source/inc/RegressionCurveCalculator.hxx | 14 +- chart2/source/inc/Scaling.hxx | 24 +- chart2/source/inc/ServiceMacros.hxx | 12 +- chart2/source/inc/UncachedDataSequence.hxx | 38 +- chart2/source/inc/WeakListenerAdapter.hxx | 4 +- chart2/source/inc/WrappedPropertySet.hxx | 38 +- chart2/source/model/filter/XMLFilter.cxx | 8 +- chart2/source/model/inc/BaseCoordinateSystem.hxx | 26 +- .../source/model/inc/CartesianCoordinateSystem.hxx | 6 +- chart2/source/model/inc/ChartTypeManager.hxx | 6 +- chart2/source/model/inc/DataSeries.hxx | 32 +- chart2/source/model/inc/Diagram.hxx | 46 +- chart2/source/model/inc/PolarCoordinateSystem.hxx | 6 +- chart2/source/model/inc/StockBar.hxx | 12 +- chart2/source/model/inc/XMLFilter.hxx | 14 +- chart2/source/model/main/Axis.cxx | 26 +- chart2/source/model/main/Axis.hxx | 26 +- chart2/source/model/main/BaseCoordinateSystem.cxx | 26 +- .../model/main/CartesianCoordinateSystem.cxx | 6 +- chart2/source/model/main/ChartModel.cxx | 112 ++-- .../source/model/main/ChartModel_Persistence.cxx | 42 +- chart2/source/model/main/DataPoint.cxx | 18 +- chart2/source/model/main/DataPoint.hxx | 18 +- chart2/source/model/main/DataSeries.cxx | 32 +- chart2/source/model/main/Diagram.cxx | 46 +- chart2/source/model/main/FormattedString.cxx | 16 +- chart2/source/model/main/FormattedString.hxx | 28 +- chart2/source/model/main/GridProperties.cxx | 12 +- chart2/source/model/main/GridProperties.hxx | 12 +- chart2/source/model/main/Legend.cxx | 12 +- chart2/source/model/main/Legend.hxx | 12 +- chart2/source/model/main/PageBackground.cxx | 12 +- chart2/source/model/main/PageBackground.hxx | 12 +- chart2/source/model/main/PolarCoordinateSystem.cxx | 6 +- chart2/source/model/main/StockBar.cxx | 12 +- chart2/source/model/main/Title.cxx | 16 +- chart2/source/model/main/Title.hxx | 16 +- chart2/source/model/main/UndoManager.cxx | 48 +- chart2/source/model/main/UndoManager.hxx | 48 +- chart2/source/model/main/Wall.cxx | 12 +- chart2/source/model/main/Wall.hxx | 12 +- chart2/source/model/template/AreaChartType.cxx | 4 +- chart2/source/model/template/AreaChartType.hxx | 4 +- .../model/template/AreaChartTypeTemplate.cxx | 8 +- .../model/template/AreaChartTypeTemplate.hxx | 8 +- chart2/source/model/template/BarChartType.cxx | 4 +- chart2/source/model/template/BarChartType.hxx | 4 +- .../source/model/template/BarChartTypeTemplate.cxx | 10 +- .../source/model/template/BarChartTypeTemplate.hxx | 10 +- chart2/source/model/template/BubbleChartType.cxx | 12 +- chart2/source/model/template/BubbleChartType.hxx | 12 +- .../model/template/BubbleChartTypeTemplate.cxx | 10 +- .../model/template/BubbleChartTypeTemplate.hxx | 10 +- .../model/template/BubbleDataInterpreter.cxx | 6 +- .../model/template/BubbleDataInterpreter.hxx | 6 +- .../source/model/template/CandleStickChartType.cxx | 14 +- .../source/model/template/CandleStickChartType.hxx | 14 +- chart2/source/model/template/ChartType.cxx | 26 +- chart2/source/model/template/ChartType.hxx | 28 +- chart2/source/model/template/ChartTypeManager.cxx | 6 +- chart2/source/model/template/ChartTypeTemplate.cxx | 18 +- chart2/source/model/template/ChartTypeTemplate.hxx | 18 +- chart2/source/model/template/ColumnChartType.cxx | 6 +- chart2/source/model/template/ColumnChartType.hxx | 6 +- .../model/template/ColumnLineChartTypeTemplate.cxx | 10 +- .../model/template/ColumnLineChartTypeTemplate.hxx | 10 +- .../model/template/ColumnLineDataInterpreter.cxx | 2 +- .../model/template/ColumnLineDataInterpreter.hxx | 2 +- chart2/source/model/template/DataInterpreter.cxx | 8 +- chart2/source/model/template/DataInterpreter.hxx | 8 +- .../source/model/template/FilledNetChartType.cxx | 4 +- .../source/model/template/FilledNetChartType.hxx | 4 +- chart2/source/model/template/LineChartType.cxx | 6 +- chart2/source/model/template/LineChartType.hxx | 6 +- .../model/template/LineChartTypeTemplate.cxx | 8 +- .../model/template/LineChartTypeTemplate.hxx | 8 +- chart2/source/model/template/NetChartType.cxx | 8 +- chart2/source/model/template/NetChartType.hxx | 8 +- .../source/model/template/NetChartTypeTemplate.cxx | 6 +- .../source/model/template/NetChartTypeTemplate.hxx | 6 +- chart2/source/model/template/PieChartType.cxx | 8 +- chart2/source/model/template/PieChartType.hxx | 8 +- .../source/model/template/PieChartTypeTemplate.cxx | 10 +- .../source/model/template/PieChartTypeTemplate.hxx | 10 +- chart2/source/model/template/ScatterChartType.cxx | 12 +- chart2/source/model/template/ScatterChartType.hxx | 12 +- .../model/template/ScatterChartTypeTemplate.cxx | 12 +- .../model/template/ScatterChartTypeTemplate.hxx | 12 +- .../model/template/StockChartTypeTemplate.cxx | 12 +- .../model/template/StockChartTypeTemplate.hxx | 12 +- .../source/model/template/StockDataInterpreter.cxx | 6 +- .../source/model/template/StockDataInterpreter.hxx | 6 +- chart2/source/model/template/XYDataInterpreter.cxx | 6 +- chart2/source/model/template/XYDataInterpreter.hxx | 6 +- chart2/source/tools/CachedDataSequence.cxx | 22 +- chart2/source/tools/ConfigColorScheme.cxx | 2 +- chart2/source/tools/DataSource.cxx | 4 +- chart2/source/tools/ErrorBar.cxx | 36 +- .../tools/ExponentialRegressionCurveCalculator.cxx | 6 +- chart2/source/tools/InternalDataProvider.cxx | 84 +-- chart2/source/tools/LabeledDataSequence.cxx | 14 +- .../tools/LinearRegressionCurveCalculator.cxx | 4 +- .../tools/LogarithmicRegressionCurveCalculator.cxx | 6 +- .../tools/MeanValueRegressionCurveCalculator.cxx | 6 +- chart2/source/tools/ModifyListenerCallBack.cxx | 8 +- chart2/source/tools/ModifyListenerHelper.cxx | 8 +- .../MovingAverageRegressionCurveCalculator.cxx | 6 +- chart2/source/tools/NameContainer.cxx | 24 +- chart2/source/tools/OPropertySet.cxx | 30 +- .../tools/PolynomialRegressionCurveCalculator.cxx | 6 +- .../tools/PotentialRegressionCurveCalculator.cxx | 6 +- chart2/source/tools/RangeHighlighter.cxx | 10 +- chart2/source/tools/RegressionCurveCalculator.cxx | 10 +- chart2/source/tools/RegressionCurveModel.cxx | 32 +- chart2/source/tools/RegressionCurveModel.hxx | 32 +- chart2/source/tools/RegressionEquation.cxx | 16 +- chart2/source/tools/RegressionEquation.hxx | 16 +- chart2/source/tools/Scaling.cxx | 24 +- chart2/source/tools/UncachedDataSequence.cxx | 38 +- chart2/source/tools/WeakListenerAdapter.cxx | 4 +- chart2/source/tools/WrappedPropertySet.cxx | 38 +- chart2/source/view/axes/DateScaling.cxx | 12 +- chart2/source/view/axes/DateScaling.hxx | 12 +- .../view/axes/VCartesianCoordinateSystem.cxx | 2 +- chart2/source/view/inc/DummyXShape.hxx | 80 +-- chart2/source/view/inc/Linear3DTransformation.hxx | 6 +- chart2/source/view/inc/VPolarTransformation.hxx | 6 +- chart2/source/view/main/ChartView.cxx | 42 +- chart2/source/view/main/DummyXShape.cxx | 92 +-- chart2/source/view/main/Linear3DTransformation.cxx | 6 +- chart2/source/view/main/VPolarTransformation.cxx | 6 +- comphelper/qa/string/test_string.cxx | 54 +- comphelper/source/compare/AnyCompareFactory.cxx | 24 +- .../container/IndexedPropertyValuesContainer.cxx | 40 +- .../container/NamedPropertyValuesContainer.cxx | 44 +- .../source/container/containermultiplexer.cxx | 8 +- comphelper/source/container/enumerablemap.cxx | 76 +-- comphelper/source/container/enumhelper.cxx | 16 +- comphelper/source/container/namecontainer.cxx | 32 +- .../source/eventattachermgr/eventattachermgr.cxx | 68 +- comphelper/source/misc/SelectionMultiplex.cxx | 4 +- .../source/misc/accessiblecomponenthelper.cxx | 20 +- comphelper/source/misc/accessiblecontexthelper.cxx | 8 +- .../source/misc/accessiblekeybindinghelper.cxx | 4 +- .../source/misc/accessibleselectionhelper.cxx | 14 +- comphelper/source/misc/accessibletexthelper.cxx | 20 +- comphelper/source/misc/accessiblewrapper.cxx | 46 +- comphelper/source/misc/accimplaccess.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/ihwrapnofilter.cxx | 10 +- comphelper/source/misc/instancelocker.cxx | 24 +- comphelper/source/misc/instancelocker.hxx | 24 +- comphelper/source/misc/interaction.cxx | 8 +- comphelper/source/misc/numberedcollection.cxx | 8 +- comphelper/source/misc/officerestartmanager.cxx | 12 +- comphelper/source/misc/officerestartmanager.hxx | 12 +- comphelper/source/misc/proxyaggregation.cxx | 12 +- comphelper/source/misc/servicedecl.cxx | 12 +- comphelper/source/misc/serviceinfohelper.cxx | 4 +- comphelper/source/misc/weak.cxx | 6 +- .../officeinstallationdirectories.cxx | 14 +- .../officeinstallationdirectories.hxx | 14 +- .../source/property/ChainablePropertySet.cxx | 32 +- .../source/property/ChainablePropertySetInfo.cxx | 6 +- comphelper/source/property/MasterPropertySet.cxx | 32 +- .../source/property/MasterPropertySetInfo.cxx | 6 +- comphelper/source/property/genericpropertyset.cxx | 36 +- comphelper/source/property/opropertybag.cxx | 40 +- comphelper/source/property/opropertybag.hxx | 52 +- comphelper/source/property/propagg.cxx | 28 +- comphelper/source/property/propertycontainer.cxx | 4 +- comphelper/source/property/propertysethelper.cxx | 32 +- comphelper/source/property/propertysetinfo.cxx | 6 +- .../source/property/propertystatecontainer.cxx | 10 +- comphelper/source/property/propmultiplex.cxx | 4 +- comphelper/source/property/propstate.cxx | 18 +- comphelper/source/streaming/memorystream.cxx | 56 +- comphelper/source/streaming/oslfile2streamwrap.cxx | 16 +- comphelper/source/streaming/seekableinput.cxx | 16 +- comphelper/source/streaming/seqinputstreamserv.cxx | 48 +- .../source/streaming/seqoutputstreamserv.cxx | 28 +- comphelper/source/streaming/seqstream.cxx | 22 +- comphelper/source/xml/attributelist.cxx | 12 +- comphelper/source/xml/ofopxmlhelper.cxx | 16 +- configmgr/source/access.cxx | 104 +-- configmgr/source/access.hxx | 104 +-- configmgr/source/childaccess.cxx | 8 +- configmgr/source/childaccess.hxx | 8 +- configmgr/source/configurationprovider.cxx | 64 +- configmgr/source/configurationregistry.cxx | 166 ++--- configmgr/source/readonlyaccess.cxx | 14 +- configmgr/source/readwriteaccess.cxx | 22 +- configmgr/source/rootaccess.cxx | 12 +- configmgr/source/rootaccess.hxx | 12 +- configmgr/source/update.cxx | 8 +- connectivity/source/commontools/BlobHelper.cxx | 10 +- .../source/commontools/ConnectionWrapper.cxx | 12 +- .../commontools/FDatabaseMetaDataResultSet.cxx | 102 +-- .../FDatabaseMetaDataResultSetMetaData.cxx | 42 +- .../source/commontools/ParamterSubstitution.cxx | 14 +- connectivity/source/commontools/TConnection.cxx | 2 +- .../source/commontools/TDatabaseMetaDataBase.cxx | 60 +- .../source/commontools/TPrivilegesResultSet.cxx | 2 +- connectivity/source/commontools/TTableHelper.cxx | 14 +- connectivity/source/commontools/conncleanup.cxx | 10 +- connectivity/source/commontools/dbtools.cxx | 8 +- connectivity/source/commontools/parameters.cxx | 2 +- connectivity/source/commontools/paramwrapper.cxx | 16 +- connectivity/source/cpool/ZConnectionPool.cxx | 4 +- connectivity/source/cpool/ZConnectionPool.hxx | 4 +- 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 | 24 +- connectivity/source/cpool/ZPoolCollection.hxx | 24 +- connectivity/source/cpool/ZPooledConnection.cxx | 4 +- connectivity/source/cpool/ZPooledConnection.hxx | 4 +- connectivity/source/drivers/calc/CConnection.cxx | 8 +- .../source/drivers/calc/CDatabaseMetaData.cxx | 16 +- connectivity/source/drivers/calc/CDriver.cxx | 8 +- connectivity/source/drivers/calc/CResultSet.cxx | 26 +- connectivity/source/drivers/calc/CTable.cxx | 6 +- connectivity/source/drivers/dbase/DConnection.cxx | 8 +- .../source/drivers/dbase/DDatabaseMetaData.cxx | 22 +- connectivity/source/drivers/dbase/DDriver.cxx | 8 +- connectivity/source/drivers/dbase/DIndex.cxx | 2 +- connectivity/source/drivers/dbase/DResultSet.cxx | 26 +- connectivity/source/drivers/dbase/DTable.cxx | 12 +- connectivity/source/drivers/dbase/DTables.cxx | 2 +- connectivity/source/drivers/evoab2/NCatalog.cxx | 2 +- connectivity/source/drivers/evoab2/NCatalog.hxx | 2 +- connectivity/source/drivers/evoab2/NConnection.cxx | 42 +- connectivity/source/drivers/evoab2/NConnection.hxx | 42 +- .../source/drivers/evoab2/NDatabaseMetaData.cxx | 242 +++---- .../source/drivers/evoab2/NDatabaseMetaData.hxx | 246 +++---- connectivity/source/drivers/evoab2/NDriver.cxx | 16 +- connectivity/source/drivers/evoab2/NDriver.hxx | 16 +- .../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 | 42 +- .../source/drivers/evoab2/NResultSetMetaData.hxx | 42 +- connectivity/source/drivers/evoab2/NStatement.cxx | 20 +- connectivity/source/drivers/evoab2/NStatement.hxx | 22 +- connectivity/source/drivers/file/FCatalog.cxx | 4 +- connectivity/source/drivers/file/FConnection.cxx | 44 +- .../source/drivers/file/FDatabaseMetaData.cxx | 244 +++---- connectivity/source/drivers/file/FDriver.cxx | 20 +- .../source/drivers/file/FPreparedStatement.cxx | 62 +- connectivity/source/drivers/file/FResultSet.cxx | 144 ++-- .../source/drivers/file/FResultSetMetaData.cxx | 42 +- connectivity/source/drivers/file/FStatement.cxx | 24 +- connectivity/source/drivers/file/FTable.cxx | 4 +- connectivity/source/drivers/file/FTables.cxx | 2 +- connectivity/source/drivers/firebird/Blob.cxx | 20 +- connectivity/source/drivers/firebird/Blob.hxx | 20 +- .../source/drivers/firebird/Connection.cxx | 46 +- .../source/drivers/firebird/Connection.hxx | 46 +- .../source/drivers/firebird/DatabaseMetaData.cxx | 298 ++++----- .../source/drivers/firebird/DatabaseMetaData.hxx | 298 ++++----- connectivity/source/drivers/firebird/Driver.cxx | 20 +- connectivity/source/drivers/firebird/Driver.hxx | 20 +- .../source/drivers/firebird/PreparedStatement.cxx | 70 +- .../source/drivers/firebird/PreparedStatement.hxx | 70 +- connectivity/source/drivers/firebird/ResultSet.cxx | 100 +-- connectivity/source/drivers/firebird/ResultSet.hxx | 94 +-- .../source/drivers/firebird/ResultSetMetaData.cxx | 42 +- .../source/drivers/firebird/ResultSetMetaData.hxx | 42 +- connectivity/source/drivers/firebird/Statement.cxx | 20 +- connectivity/source/drivers/firebird/Statement.hxx | 20 +- .../drivers/firebird/StatementCommonBase.cxx | 22 +- .../drivers/firebird/StatementCommonBase.hxx | 22 +- connectivity/source/drivers/firebird/Table.cxx | 8 +- connectivity/source/drivers/firebird/Table.hxx | 8 +- connectivity/source/drivers/flat/EConnection.cxx | 8 +- .../source/drivers/flat/EDatabaseMetaData.cxx | 4 +- connectivity/source/drivers/flat/EDriver.cxx | 8 +- 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 | 32 +- connectivity/source/drivers/hsqldb/HTable.cxx | 10 +- .../source/drivers/hsqldb/HTerminateListener.cxx | 6 +- .../source/drivers/hsqldb/HTerminateListener.hxx | 6 +- connectivity/source/drivers/hsqldb/HUser.cxx | 10 +- connectivity/source/drivers/hsqldb/HView.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 | 16 +- connectivity/source/drivers/jdbc/JStatement.cxx | 40 +- .../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 | 142 ++-- .../source/drivers/jdbc/ResultSetMetaData.cxx | 42 +- connectivity/source/drivers/kab/KCatalog.cxx | 2 +- connectivity/source/drivers/kab/KCatalog.hxx | 2 +- connectivity/source/drivers/kab/KConnection.cxx | 42 +- connectivity/source/drivers/kab/KConnection.hxx | 42 +- .../source/drivers/kab/KDatabaseMetaData.cxx | 298 ++++----- .../source/drivers/kab/KDatabaseMetaData.hxx | 298 ++++----- connectivity/source/drivers/kab/KDriver.cxx | 22 +- connectivity/source/drivers/kab/KDriver.hxx | 22 +- .../source/drivers/kab/KPreparedStatement.cxx | 60 +- .../source/drivers/kab/KPreparedStatement.hxx | 60 +- connectivity/source/drivers/kab/KResultSet.cxx | 156 ++--- connectivity/source/drivers/kab/KResultSet.hxx | 156 ++--- .../source/drivers/kab/KResultSetMetaData.cxx | 42 +- .../source/drivers/kab/KResultSetMetaData.hxx | 42 +- connectivity/source/drivers/kab/KStatement.cxx | 24 +- connectivity/source/drivers/kab/KStatement.hxx | 24 +- connectivity/source/drivers/mork/MCatalog.cxx | 2 +- connectivity/source/drivers/mork/MCatalog.hxx | 2 +- connectivity/source/drivers/mork/MConnection.cxx | 42 +- connectivity/source/drivers/mork/MConnection.hxx | 42 +- .../source/drivers/mork/MDatabaseMetaData.cxx | 244 +++---- .../source/drivers/mork/MDatabaseMetaData.hxx | 250 +++---- connectivity/source/drivers/mork/MDriver.cxx | 16 +- connectivity/source/drivers/mork/MDriver.hxx | 16 +- .../source/drivers/mork/MPreparedStatement.cxx | 68 +- .../source/drivers/mork/MPreparedStatement.hxx | 68 +- connectivity/source/drivers/mork/MResultSet.cxx | 162 ++--- connectivity/source/drivers/mork/MResultSet.hxx | 156 ++--- .../source/drivers/mork/MResultSetMetaData.cxx | 42 +- .../source/drivers/mork/MResultSetMetaData.hxx | 42 +- connectivity/source/drivers/mork/MStatement.cxx | 24 +- connectivity/source/drivers/mork/MStatement.hxx | 24 +- .../drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 32 +- .../drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 32 +- connectivity/source/drivers/mysql/YCatalog.cxx | 4 +- connectivity/source/drivers/mysql/YColumns.cxx | 2 +- connectivity/source/drivers/mysql/YDriver.cxx | 20 +- connectivity/source/drivers/mysql/YTable.cxx | 4 +- connectivity/source/drivers/mysql/YUser.cxx | 10 +- connectivity/source/drivers/odbc/OConnection.cxx | 42 +- .../source/drivers/odbc/ODatabaseMetaData.cxx | 268 ++++---- .../drivers/odbc/ODatabaseMetaDataResultSet.cxx | 96 +-- connectivity/source/drivers/odbc/ODriver.cxx | 16 +- .../source/drivers/odbc/OPreparedStatement.cxx | 70 +- connectivity/source/drivers/odbc/OResultSet.cxx | 162 ++--- .../source/drivers/odbc/OResultSetMetaData.cxx | 42 +- connectivity/source/drivers/odbc/OStatement.cxx | 40 +- .../source/drivers/postgresql/pq_array.cxx | 12 +- .../source/drivers/postgresql/pq_array.hxx | 12 +- .../source/drivers/postgresql/pq_baseresultset.cxx | 86 +-- .../source/drivers/postgresql/pq_baseresultset.hxx | 86 +-- .../source/drivers/postgresql/pq_connection.cxx | 52 +- .../source/drivers/postgresql/pq_connection.hxx | 50 +- .../drivers/postgresql/pq_databasemetadata.cxx | 298 ++++----- .../drivers/postgresql/pq_databasemetadata.hxx | 298 ++++----- .../source/drivers/postgresql/pq_driver.cxx | 34 +- .../source/drivers/postgresql/pq_driver.hxx | 20 +- .../postgresql/pq_fakedupdateableresultset.cxx | 52 +- .../postgresql/pq_fakedupdateableresultset.hxx | 52 +- .../drivers/postgresql/pq_preparedstatement.cxx | 80 +-- .../drivers/postgresql/pq_preparedstatement.hxx | 80 +-- .../source/drivers/postgresql/pq_resultset.cxx | 6 +- .../source/drivers/postgresql/pq_resultset.hxx | 6 +- .../drivers/postgresql/pq_resultsetmetadata.cxx | 42 +- .../drivers/postgresql/pq_resultsetmetadata.hxx | 42 +- .../drivers/postgresql/pq_sequenceresultset.cxx | 6 +- .../drivers/postgresql/pq_sequenceresultset.hxx | 6 +- .../postgresql/pq_sequenceresultsetmetadata.cxx | 42 +- .../postgresql/pq_sequenceresultsetmetadata.hxx | 42 +- .../source/drivers/postgresql/pq_statement.cxx | 34 +- .../source/drivers/postgresql/pq_statement.hxx | 34 +- .../drivers/postgresql/pq_updateableresultset.cxx | 54 +- .../drivers/postgresql/pq_updateableresultset.hxx | 54 +- .../source/drivers/postgresql/pq_xbase.cxx | 20 +- .../source/drivers/postgresql/pq_xbase.hxx | 22 +- .../source/drivers/postgresql/pq_xcolumn.cxx | 4 +- .../source/drivers/postgresql/pq_xcolumn.hxx | 4 +- .../source/drivers/postgresql/pq_xcolumns.cxx | 10 +- .../source/drivers/postgresql/pq_xcolumns.hxx | 10 +- .../source/drivers/postgresql/pq_xcontainer.cxx | 38 +- .../source/drivers/postgresql/pq_xcontainer.hxx | 34 +- .../source/drivers/postgresql/pq_xindex.cxx | 20 +- .../source/drivers/postgresql/pq_xindex.hxx | 20 +- .../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 | 12 +- .../source/drivers/postgresql/pq_xindexes.cxx | 10 +- .../source/drivers/postgresql/pq_xindexes.hxx | 10 +- connectivity/source/drivers/postgresql/pq_xkey.cxx | 20 +- connectivity/source/drivers/postgresql/pq_xkey.hxx | 20 +- .../source/drivers/postgresql/pq_xkeycolumn.cxx | 4 +- .../source/drivers/postgresql/pq_xkeycolumn.hxx | 4 +- .../source/drivers/postgresql/pq_xkeycolumns.cxx | 10 +- .../source/drivers/postgresql/pq_xkeycolumns.hxx | 10 +- .../source/drivers/postgresql/pq_xkeys.cxx | 10 +- .../source/drivers/postgresql/pq_xkeys.hxx | 10 +- .../source/drivers/postgresql/pq_xtable.cxx | 40 +- .../source/drivers/postgresql/pq_xtable.hxx | 40 +- .../source/drivers/postgresql/pq_xtables.cxx | 8 +- .../source/drivers/postgresql/pq_xtables.hxx | 8 +- .../source/drivers/postgresql/pq_xuser.cxx | 20 +- .../source/drivers/postgresql/pq_xuser.hxx | 20 +- .../source/drivers/postgresql/pq_xusers.cxx | 10 +- .../source/drivers/postgresql/pq_xusers.hxx | 10 +- .../source/drivers/postgresql/pq_xview.cxx | 16 +- .../source/drivers/postgresql/pq_xview.hxx | 16 +- .../source/drivers/postgresql/pq_xviews.cxx | 10 +- .../source/drivers/postgresql/pq_xviews.hxx | 10 +- .../source/inc/FDatabaseMetaDataResultSet.hxx | 102 +-- .../inc/FDatabaseMetaDataResultSetMetaData.hxx | 42 +- connectivity/source/inc/ParameterSubstitution.hxx | 14 +- connectivity/source/inc/TConnection.hxx | 2 +- connectivity/source/inc/TDatabaseMetaDataBase.hxx | 60 +- connectivity/source/inc/TPrivilegesResultSet.hxx | 2 +- connectivity/source/inc/calc/CConnection.hxx | 8 +- connectivity/source/inc/calc/CDatabaseMetaData.hxx | 16 +- connectivity/source/inc/calc/CDriver.hxx | 8 +- connectivity/source/inc/calc/CResultSet.hxx | 20 +- connectivity/source/inc/calc/CTable.hxx | 6 +- connectivity/source/inc/dbase/DConnection.hxx | 8 +- .../source/inc/dbase/DDatabaseMetaData.hxx | 26 +- connectivity/source/inc/dbase/DDriver.hxx | 8 +- connectivity/source/inc/dbase/DIndex.hxx | 2 +- connectivity/source/inc/dbase/DResultSet.hxx | 20 +- connectivity/source/inc/dbase/DTable.hxx | 12 +- connectivity/source/inc/dbase/DTables.hxx | 2 +- connectivity/source/inc/file/FCatalog.hxx | 4 +- connectivity/source/inc/file/FConnection.hxx | 44 +- connectivity/source/inc/file/FDatabaseMetaData.hxx | 244 +++---- connectivity/source/inc/file/FDriver.hxx | 20 +- .../source/inc/file/FPreparedStatement.hxx | 62 +- connectivity/source/inc/file/FResultSet.hxx | 144 ++-- .../source/inc/file/FResultSetMetaData.hxx | 42 +- connectivity/source/inc/file/FStatement.hxx | 24 +- connectivity/source/inc/file/FTable.hxx | 6 +- connectivity/source/inc/file/FTables.hxx | 2 +- connectivity/source/inc/flat/EConnection.hxx | 8 +- connectivity/source/inc/flat/EDatabaseMetaData.hxx | 4 +- connectivity/source/inc/flat/EDriver.hxx | 8 +- 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 | 26 +- connectivity/source/inc/hsqldb/HTable.hxx | 10 +- connectivity/source/inc/hsqldb/HUser.hxx | 10 +- connectivity/source/inc/hsqldb/HView.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 | 16 +- connectivity/source/inc/java/sql/JStatement.hxx | 40 +- .../source/inc/java/sql/PreparedStatement.hxx | 66 +- connectivity/source/inc/java/sql/Ref.hxx | 2 +- connectivity/source/inc/java/sql/ResultSet.hxx | 142 ++-- .../source/inc/java/sql/ResultSetMetaData.hxx | 42 +- connectivity/source/inc/mysql/YCatalog.hxx | 4 +- connectivity/source/inc/mysql/YColumns.hxx | 2 +- connectivity/source/inc/mysql/YDriver.hxx | 14 +- connectivity/source/inc/mysql/YTable.hxx | 4 +- connectivity/source/inc/mysql/YUser.hxx | 10 +- connectivity/source/inc/odbc/OConnection.hxx | 42 +- connectivity/source/inc/odbc/ODatabaseMetaData.hxx | 268 ++++---- .../source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 96 +-- connectivity/source/inc/odbc/ODriver.hxx | 16 +- .../source/inc/odbc/OPreparedStatement.hxx | 70 +- connectivity/source/inc/odbc/OResultSet.hxx | 156 ++--- .../source/inc/odbc/OResultSetMetaData.hxx | 42 +- connectivity/source/inc/odbc/OStatement.hxx | 40 +- connectivity/source/manager/mdrivermanager.cxx | 36 +- connectivity/source/manager/mdrivermanager.hxx | 28 +- 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 +- cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx | 2 +- cppuhelper/source/component.cxx | 12 +- cppuhelper/source/component_context.cxx | 44 +- cppuhelper/source/exc_thrower.cxx | 12 +- cppuhelper/source/factory.cxx | 128 ++-- cppuhelper/source/implbase.cxx | 18 +- cppuhelper/source/macro_expander.cxx | 16 +- cppuhelper/source/propertysetmixin.cxx | 10 +- cppuhelper/source/propshlp.cxx | 44 +- cppuhelper/source/servicemanager.cxx | 96 +-- cppuhelper/source/servicemanager.hxx | 52 +- cppuhelper/source/tdmgr.cxx | 4 +- cppuhelper/source/typemanager.cxx | 338 +++++----- cppuhelper/source/typemanager.hxx | 24 +- cppuhelper/source/weak.cxx | 34 +- cpputools/source/unoexe/unoexe.cxx | 8 +- cui/source/dialogs/colorpicker.cxx | 32 +- dbaccess/source/core/api/CRowSetColumn.cxx | 2 +- dbaccess/source/core/api/CRowSetColumn.hxx | 2 +- dbaccess/source/core/api/CRowSetDataColumn.cxx | 4 +- dbaccess/source/core/api/CRowSetDataColumn.hxx | 4 +- dbaccess/source/core/api/CacheSet.cxx | 40 +- dbaccess/source/core/api/CacheSet.hxx | 40 +- dbaccess/source/core/api/KeySet.cxx | 40 +- dbaccess/source/core/api/KeySet.hxx | 40 +- dbaccess/source/core/api/PrivateRow.cxx | 40 +- dbaccess/source/core/api/PrivateRow.hxx | 40 +- dbaccess/source/core/api/RowSet.cxx | 208 +++--- dbaccess/source/core/api/RowSet.hxx | 212 +++--- dbaccess/source/core/api/RowSetBase.cxx | 102 +-- dbaccess/source/core/api/RowSetBase.hxx | 110 +-- .../source/core/api/SingleSelectQueryComposer.cxx | 54 +- dbaccess/source/core/api/TableDeco.cxx | 30 +- dbaccess/source/core/api/View.cxx | 6 +- dbaccess/source/core/api/callablestatement.cxx | 54 +- dbaccess/source/core/api/column.cxx | 28 +- dbaccess/source/core/api/datacolumn.cxx | 84 +-- dbaccess/source/core/api/datacolumn.hxx | 84 +-- dbaccess/source/core/api/definitioncolumn.cxx | 26 +- dbaccess/source/core/api/preparedstatement.cxx | 70 +- dbaccess/source/core/api/query.cxx | 12 +- dbaccess/source/core/api/query.hxx | 12 +- dbaccess/source/core/api/querycomposer.cxx | 38 +- dbaccess/source/core/api/querycontainer.cxx | 28 +- dbaccess/source/core/api/querydescriptor.cxx | 12 +- dbaccess/source/core/api/querydescriptor.hxx | 12 +- dbaccess/source/core/api/resultcolumn.cxx | 6 +- dbaccess/source/core/api/resultcolumn.hxx | 6 +- dbaccess/source/core/api/resultset.cxx | 162 ++--- dbaccess/source/core/api/resultset.hxx | 162 ++--- dbaccess/source/core/api/statement.cxx | 50 +- dbaccess/source/core/api/table.cxx | 12 +- dbaccess/source/core/api/tablecontainer.cxx | 8 +- dbaccess/source/core/api/viewcontainer.cxx | 8 +- .../source/core/dataaccess/ComponentDefinition.cxx | 16 +- .../source/core/dataaccess/ComponentDefinition.hxx | 12 +- dbaccess/source/core/dataaccess/ContentHelper.cxx | 32 +- dbaccess/source/core/dataaccess/ModelImpl.cxx | 28 +- .../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 | 4 +- .../source/core/dataaccess/commandcontainer.hxx | 4 +- .../source/core/dataaccess/commanddefinition.cxx | 6 +- .../source/core/dataaccess/commanddefinition.hxx | 32 +- dbaccess/source/core/dataaccess/connection.cxx | 92 +-- dbaccess/source/core/dataaccess/connection.hxx | 92 +-- .../core/dataaccess/dataaccessdescriptor.cxx | 32 +- .../source/core/dataaccess/databasecontext.cxx | 64 +- .../source/core/dataaccess/databasecontext.hxx | 52 +- .../source/core/dataaccess/databasedocument.cxx | 152 ++--- .../source/core/dataaccess/databasedocument.hxx | 152 ++--- .../core/dataaccess/databaseregistrations.cxx | 36 +- dbaccess/source/core/dataaccess/datasource.cxx | 88 +-- dbaccess/source/core/dataaccess/datasource.hxx | 52 +- .../source/core/dataaccess/definitioncontainer.cxx | 40 +- .../source/core/dataaccess/documentcontainer.cxx | 34 +- .../source/core/dataaccess/documentcontainer.hxx | 34 +- .../source/core/dataaccess/documentdefinition.cxx | 52 +- .../source/core/dataaccess/documentdefinition.hxx | 26 +- .../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 | 24 +- dbaccess/source/core/dataaccess/intercept.hxx | 24 +- dbaccess/source/core/inc/ContainerMediator.hxx | 8 +- dbaccess/source/core/inc/ContentHelper.hxx | 40 +- dbaccess/source/core/inc/DatabaseDataProvider.hxx | 212 +++--- dbaccess/source/core/inc/PropertyForward.hxx | 4 +- .../source/core/inc/SingleSelectQueryComposer.hxx | 54 +- dbaccess/source/core/inc/TableDeco.hxx | 30 +- dbaccess/source/core/inc/View.hxx | 2 +- dbaccess/source/core/inc/callablestatement.hxx | 54 +- dbaccess/source/core/inc/column.hxx | 32 +- dbaccess/source/core/inc/definitioncolumn.hxx | 36 +- dbaccess/source/core/inc/definitioncontainer.hxx | 40 +- dbaccess/source/core/inc/preparedstatement.hxx | 70 +- dbaccess/source/core/inc/querycomposer.hxx | 38 +- dbaccess/source/core/inc/querycontainer.hxx | 28 +- dbaccess/source/core/inc/statement.hxx | 50 +- dbaccess/source/core/inc/table.hxx | 10 +- 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 | 212 +++--- 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 | 20 +- .../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 | 2 +- dbaccess/source/filter/xml/xmlExport.hxx | 2 +- dbaccess/source/filter/xml/xmlfilter.cxx | 6 +- dbaccess/source/filter/xml/xmlfilter.hxx | 2 +- .../source/inc/OAuthenticationContinuation.hxx | 24 +- dbaccess/source/inc/apitools.hxx | 40 +- .../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 | 28 +- dbaccess/source/ui/app/AppController.hxx | 58 +- dbaccess/source/ui/app/AppControllerGen.cxx | 32 +- 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 | 20 +- dbaccess/source/ui/browser/formadapter.cxx | 322 ++++----- dbaccess/source/ui/browser/genericcontroller.cxx | 72 +- dbaccess/source/ui/browser/sbagrid.cxx | 36 +- dbaccess/source/ui/browser/sbamultiplex.cxx | 8 +- dbaccess/source/ui/browser/unodatbr.cxx | 48 +- dbaccess/source/ui/control/dbtreelistbox.cxx | 16 +- dbaccess/source/ui/control/sqledit.cxx | 4 +- dbaccess/source/ui/control/toolboxcontroller.cxx | 8 +- 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 | 4 +- dbaccess/source/ui/inc/JoinExchange.hxx | 4 +- dbaccess/source/ui/inc/RelationController.hxx | 4 +- dbaccess/source/ui/inc/RelationTableView.hxx | 6 +- dbaccess/source/ui/inc/TableController.hxx | 8 +- 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 | 20 +- dbaccess/source/ui/inc/formadapter.hxx | 354 +++++----- dbaccess/source/ui/inc/querycontroller.hxx | 14 +- dbaccess/source/ui/inc/sbagrid.hxx | 36 +- dbaccess/source/ui/inc/sbamultiplex.hxx | 36 +- dbaccess/source/ui/inc/singledoccontroller.hxx | 4 +- dbaccess/source/ui/inc/toolboxcontroller.hxx | 8 +- dbaccess/source/ui/inc/unodatbr.hxx | 48 +- dbaccess/source/ui/inc/unosqlmessage.hxx | 10 +- 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 | 22 +- dbaccess/source/ui/misc/singledoccontroller.cxx | 4 +- .../source/ui/querydesign/ConnectionLineAccess.cxx | 38 +- dbaccess/source/ui/querydesign/JAccess.cxx | 10 +- dbaccess/source/ui/querydesign/JoinController.cxx | 4 +- 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 | 16 +- .../source/ui/querydesign/limitboxcontroller.hxx | 16 +- dbaccess/source/ui/querydesign/querycontroller.cxx | 18 +- .../ui/relationdesign/RelationController.cxx | 4 +- .../source/ui/relationdesign/RelationTableView.cxx | 6 +- dbaccess/source/ui/tabledesign/TableController.cxx | 8 +- dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 16 +- dbaccess/source/ui/uno/ColumnControl.cxx | 2 +- dbaccess/source/ui/uno/ColumnControl.hxx | 2 +- dbaccess/source/ui/uno/ColumnModel.cxx | 12 +- dbaccess/source/ui/uno/ColumnModel.hxx | 10 +- dbaccess/source/ui/uno/ColumnPeer.cxx | 4 +- dbaccess/source/ui/uno/ColumnPeer.hxx | 4 +- dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 8 +- dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 8 +- dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 8 +- dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 8 +- dbaccess/source/ui/uno/TableFilterDlg.cxx | 8 +- dbaccess/source/ui/uno/TableFilterDlg.hxx | 8 +- dbaccess/source/ui/uno/UserSettingsDlg.cxx | 8 +- dbaccess/source/ui/uno/UserSettingsDlg.hxx | 8 +- dbaccess/source/ui/uno/admindlg.cxx | 8 +- dbaccess/source/ui/uno/admindlg.hxx | 8 +- dbaccess/source/ui/uno/composerdialogs.cxx | 4 +- dbaccess/source/ui/uno/composerdialogs.hxx | 4 +- dbaccess/source/ui/uno/copytablewizard.cxx | 64 +- dbaccess/source/ui/uno/dbinteraction.cxx | 4 +- dbaccess/source/ui/uno/dbinteraction.hxx | 4 +- .../source/ui/uno/textconnectionsettings_uno.cxx | 22 +- dbaccess/source/ui/uno/unosqlmessage.cxx | 10 +- desktop/source/app/check_ext_deps.cxx | 24 +- desktop/source/app/configinit.cxx | 8 +- desktop/source/app/desktopcontext.cxx | 2 +- desktop/source/app/desktopcontext.hxx | 2 +- desktop/source/app/dispatchwatcher.cxx | 4 +- desktop/source/app/dispatchwatcher.hxx | 4 +- desktop/source/app/officeipcthread.cxx | 12 +- desktop/source/app/officeipcthread.hxx | 12 +- desktop/source/deployment/dp_log.cxx | 12 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 +- desktop/source/deployment/gui/dp_gui_dialog2.hxx | 4 +- .../deployment/gui/dp_gui_extensioncmdqueue.cxx | 24 +- .../source/deployment/gui/dp_gui_extlistbox.cxx | 2 +- .../source/deployment/gui/dp_gui_extlistbox.hxx | 2 +- desktop/source/deployment/gui/dp_gui_service.cxx | 12 +- desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 8 +- desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 8 +- .../deployment/gui/dp_gui_updateinstalldialog.cxx | 24 +- desktop/source/deployment/gui/license_dialog.cxx | 4 +- desktop/source/deployment/gui/license_dialog.hxx | 4 +- desktop/source/deployment/inc/dp_interact.h | 2 +- .../deployment/manager/dp_commandenvironments.cxx | 20 +- .../deployment/manager/dp_commandenvironments.hxx | 20 +- .../deployment/manager/dp_extensionmanager.cxx | 34 +- .../deployment/manager/dp_extensionmanager.hxx | 34 +- .../deployment/manager/dp_informationprovider.cxx | 12 +- desktop/source/deployment/manager/dp_manager.cxx | 46 +- desktop/source/deployment/manager/dp_manager.h | 46 +- .../source/deployment/manager/dp_managerfac.cxx | 4 +- .../deployment/misc/dp_descriptioninfoset.cxx | 20 +- desktop/source/deployment/misc/dp_interact.cxx | 18 +- .../deployment/registry/component/dp_component.cxx | 8 +- .../registry/configuration/dp_configuration.cxx | 8 +- desktop/source/deployment/registry/dp_backend.cxx | 70 +- desktop/source/deployment/registry/dp_registry.cxx | 16 +- .../registry/executable/dp_executable.cxx | 8 +- .../source/deployment/registry/help/dp_help.cxx | 12 +- .../source/deployment/registry/inc/dp_backend.h | 70 +- .../deployment/registry/package/dp_package.cxx | 72 +- .../deployment/registry/script/dp_script.cxx | 12 +- .../deployment/registry/sfwk/dp_parceldesc.cxx | 16 +- .../deployment/registry/sfwk/dp_parceldesc.hxx | 16 +- .../source/deployment/registry/sfwk/dp_sfwk.cxx | 16 +- .../source/migration/services/basicmigration.cxx | 10 +- .../source/migration/services/basicmigration.hxx | 10 +- desktop/source/migration/services/jvmfwk.cxx | 72 +- .../migration/services/oo3extensionmigration.cxx | 22 +- .../migration/services/oo3extensionmigration.hxx | 22 +- .../migration/services/wordbookmigration.cxx | 10 +- .../migration/services/wordbookmigration.hxx | 10 +- desktop/source/offacc/acceptor.cxx | 10 +- desktop/source/offacc/acceptor.hxx | 10 +- desktop/source/pkgchk/unopkg/unopkg_app.cxx | 8 +- desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 24 +- desktop/source/splash/splash.cxx | 30 +- desktop/source/splash/unxsplash.cxx | 18 +- desktop/source/splash/unxsplash.hxx | 18 +- .../drawinglayeruno/xprimitive2drenderer.cxx | 16 +- .../source/primitive2d/baseprimitive2d.cxx | 4 +- .../source/primitive3d/baseprimitive3d.cxx | 4 +- dtrans/source/cnttype/mcnttfactory.cxx | 8 +- dtrans/source/cnttype/mcnttfactory.hxx | 8 +- dtrans/source/cnttype/mcnttype.cxx | 12 +- dtrans/source/cnttype/mcnttype.hxx | 12 +- .../accessibility/AccessibleComponentBase.cxx | 26 +- .../source/accessibility/AccessibleContextBase.cxx | 36 +- .../accessibility/AccessibleEditableTextPara.cxx | 118 ++-- .../source/accessibility/AccessibleHyperlink.cxx | 18 +- .../source/accessibility/AccessibleHyperlink.hxx | 18 +- .../source/accessibility/AccessibleImageBullet.cxx | 52 +- .../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 | 4 +- editeng/source/editeng/impedit.hxx | 4 +- editeng/source/misc/unolingu.cxx | 52 +- editeng/source/uno/UnoForbiddenCharsTable.cxx | 12 +- editeng/source/uno/unofield.cxx | 42 +- editeng/source/uno/unonrule.cxx | 24 +- editeng/source/uno/unopracc.cxx | 14 +- editeng/source/uno/unotext.cxx | 126 ++-- editeng/source/uno/unotext2.cxx | 92 +-- editeng/source/xml/xmltxtexp.cxx | 76 +-- embeddedobj/source/commonembedding/embedobj.cxx | 28 +- embeddedobj/source/commonembedding/inplaceobj.cxx | 6 +- embeddedobj/source/commonembedding/miscobj.cxx | 24 +- embeddedobj/source/commonembedding/persistence.cxx | 24 +- .../source/commonembedding/specialobject.cxx | 14 +- embeddedobj/source/commonembedding/visobj.cxx | 8 +- embeddedobj/source/commonembedding/xfactory.cxx | 24 +- embeddedobj/source/commonembedding/xfactory.hxx | 24 +- embeddedobj/source/general/docholder.cxx | 24 +- embeddedobj/source/general/dummyobject.cxx | 70 +- embeddedobj/source/general/intercept.cxx | 20 +- embeddedobj/source/general/xcreator.cxx | 16 +- embeddedobj/source/inc/closepreventer.hxx | 6 +- embeddedobj/source/inc/commonembobj.hxx | 90 +-- embeddedobj/source/inc/docholder.hxx | 24 +- embeddedobj/source/inc/dummyobject.hxx | 70 +- embeddedobj/source/inc/intercept.hxx | 20 +- embeddedobj/source/inc/oleembobj.hxx | 86 +-- embeddedobj/source/inc/specialobject.hxx | 14 +- embeddedobj/source/inc/xcreator.hxx | 16 +- embeddedobj/source/msole/closepreventer.cxx | 6 +- embeddedobj/source/msole/oleembed.cxx | 22 +- embeddedobj/source/msole/olemisc.cxx | 32 +- embeddedobj/source/msole/olepersist.cxx | 24 +- embeddedobj/source/msole/olevisual.cxx | 8 +- embeddedobj/source/msole/ownview.cxx | 12 +- embeddedobj/source/msole/ownview.hxx | 8 +- embeddedobj/source/msole/xolefactory.cxx | 16 +- embeddedobj/source/msole/xolefactory.hxx | 16 +- eventattacher/source/eventattacher.cxx | 68 +- extensions/source/abpilot/unodialogabp.cxx | 16 +- extensions/source/abpilot/unodialogabp.hxx | 16 +- extensions/source/bibliography/bibload.cxx | 68 +- extensions/source/bibliography/datman.cxx | 28 +- extensions/source/bibliography/datman.hxx | 28 +- extensions/source/bibliography/framectr.cxx | 44 +- extensions/source/bibliography/framectr.hxx | 36 +- extensions/source/bibliography/general.cxx | 18 +- extensions/source/bibliography/general.hxx | 6 +- .../source/bibliography/loadlisteneradapter.cxx | 14 +- .../source/bibliography/loadlisteneradapter.hxx | 14 +- extensions/source/bibliography/toolbar.cxx | 8 +- extensions/source/bibliography/toolbar.hxx | 10 +- .../source/config/ldap/ldapuserprofilebe.cxx | 10 +- .../source/config/ldap/ldapuserprofilebe.hxx | 20 +- extensions/source/dbpilots/unoautopilot.hxx | 8 +- extensions/source/dbpilots/unoautopilot.inl | 8 +- extensions/source/logging/consolehandler.cxx | 56 +- extensions/source/logging/csvformatter.cxx | 70 +- extensions/source/logging/filehandler.cxx | 48 +- extensions/source/logging/logger.cxx | 64 +- extensions/source/logging/plaintextformatter.cxx | 24 +- .../source/nsplugin/source/so_closelistener.cxx | 6 +- .../source/nsplugin/source/so_closelistener.hxx | 6 +- extensions/source/plugin/base/context.cxx | 46 +- extensions/source/plugin/base/evtlstnr.cxx | 2 +- extensions/source/plugin/base/manager.cxx | 6 +- extensions/source/plugin/base/multiplx.cxx | 46 +- extensions/source/plugin/base/plctrl.cxx | 54 +- extensions/source/plugin/base/plmodel.cxx | 18 +- extensions/source/plugin/base/xplugin.cxx | 24 +- extensions/source/plugin/inc/plugin/impl.hxx | 44 +- extensions/source/plugin/inc/plugin/model.hxx | 20 +- extensions/source/plugin/inc/plugin/multiplx.hxx | 46 +- extensions/source/plugin/inc/plugin/plctrl.hxx | 80 +-- .../source/propctrlr/MasterDetailLinkDialog.cxx | 8 +- .../source/propctrlr/MasterDetailLinkDialog.hxx | 8 +- extensions/source/propctrlr/browserlistbox.cxx | 12 +- .../source/propctrlr/buttonnavigationhandler.cxx | 16 +- .../source/propctrlr/buttonnavigationhandler.hxx | 16 +- extensions/source/propctrlr/cellbindinghandler.cxx | 12 +- extensions/source/propctrlr/cellbindinghandler.hxx | 12 +- extensions/source/propctrlr/composeduiupdate.cxx | 40 +- extensions/source/propctrlr/controlfontdialog.cxx | 10 +- extensions/source/propctrlr/controlfontdialog.hxx | 10 +- .../source/propctrlr/defaultforminspection.cxx | 12 +- .../source/propctrlr/defaultforminspection.hxx | 12 +- .../source/propctrlr/defaulthelpprovider.cxx | 6 +- .../source/propctrlr/defaulthelpprovider.hxx | 6 +- .../source/propctrlr/editpropertyhandler.cxx | 10 +- .../source/propctrlr/editpropertyhandler.hxx | 10 +- .../source/propctrlr/eformspropertyhandler.cxx | 22 +- .../source/propctrlr/eformspropertyhandler.hxx | 22 +- extensions/source/propctrlr/eventhandler.cxx | 62 +- extensions/source/propctrlr/eventhandler.hxx | 38 +- .../source/propctrlr/formcomponenthandler.cxx | 28 +- .../source/propctrlr/formcomponenthandler.hxx | 28 +- extensions/source/propctrlr/formcontroller.cxx | 10 +- extensions/source/propctrlr/formcontroller.hxx | 8 +- .../source/propctrlr/formgeometryhandler.cxx | 36 +- .../source/propctrlr/genericpropertyhandler.cxx | 46 +- .../source/propctrlr/genericpropertyhandler.hxx | 38 +- extensions/source/propctrlr/inspectormodelbase.cxx | 16 +- extensions/source/propctrlr/inspectormodelbase.hxx | 16 +- .../source/propctrlr/objectinspectormodel.cxx | 24 +- extensions/source/propctrlr/pcrcommon.hxx | 12 +- extensions/source/propctrlr/pcrunodialogs.cxx | 10 +- extensions/source/propctrlr/pcrunodialogs.hxx | 10 +- extensions/source/propctrlr/propcontroller.cxx | 78 +-- extensions/source/propctrlr/propcontroller.hxx | 76 +-- extensions/source/propctrlr/propertycomposer.cxx | 36 +- extensions/source/propctrlr/propertycomposer.hxx | 36 +- .../source/propctrlr/propertycontrolextender.cxx | 6 +- .../source/propctrlr/propertycontrolextender.hxx | 6 +- extensions/source/propctrlr/propertyhandler.cxx | 30 +- 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 | 108 +-- extensions/source/propctrlr/standardcontrol.hxx | 108 +-- .../source/propctrlr/stringrepresentation.cxx | 24 +- extensions/source/propctrlr/submissionhandler.cxx | 16 +- extensions/source/propctrlr/submissionhandler.hxx | 16 +- extensions/source/propctrlr/taborder.cxx | 16 +- extensions/source/propctrlr/usercontrol.cxx | 18 +- extensions/source/propctrlr/usercontrol.hxx | 18 +- .../propctrlr/xsdvalidationpropertyhandler.cxx | 18 +- .../propctrlr/xsdvalidationpropertyhandler.hxx | 18 +- extensions/source/resource/ResourceIndexAccess.cxx | 22 +- extensions/source/resource/ResourceIndexAccess.hxx | 10 +- extensions/source/resource/oooresourceloader.cxx | 40 +- extensions/source/resource/oooresourceloader.hxx | 4 +- extensions/source/scanner/sane.hxx | 8 +- extensions/source/scanner/scanner.cxx | 6 +- extensions/source/scanner/scanner.hxx | 20 +- extensions/source/scanner/scanunx.cxx | 20 +- extensions/source/update/check/updatecheck.cxx | 4 +- .../source/update/check/updatecheckconfig.cxx | 24 +- .../source/update/check/updatecheckconfig.hxx | 24 +- extensions/source/update/check/updatecheckjob.cxx | 28 +- extensions/source/update/check/updatehdl.cxx | 24 +- extensions/source/update/check/updatehdl.hxx | 24 +- extensions/source/update/feed/updatefeed.cxx | 48 +- extensions/source/update/ui/updatecheckui.cxx | 48 +- filter/source/config/cache/basecontainer.cxx | 32 +- filter/source/config/cache/basecontainer.hxx | 32 +- filter/source/config/cache/cacheupdatelistener.cxx | 4 +- filter/source/config/cache/cacheupdatelistener.hxx | 4 +- filter/source/config/cache/configflush.cxx | 12 +- filter/source/config/cache/configflush.hxx | 12 +- .../source/config/cache/contenthandlerfactory.cxx | 6 +- .../source/config/cache/contenthandlerfactory.hxx | 20 +- filter/source/config/cache/filterfactory.cxx | 8 +- filter/source/config/cache/filterfactory.hxx | 8 +- filter/source/config/cache/frameloaderfactory.cxx | 6 +- filter/source/config/cache/frameloaderfactory.hxx | 20 +- filter/source/config/cache/lateinitlistener.cxx | 4 +- filter/source/config/cache/lateinitlistener.hxx | 4 +- filter/source/config/cache/typedetection.cxx | 4 +- filter/source/config/cache/typedetection.hxx | 4 +- filter/source/flash/swfdialog.cxx | 16 +- filter/source/flash/swfdialog.hxx | 16 +- filter/source/flash/swffilter.cxx | 40 +- filter/source/graphic/GraphicExportDialog.cxx | 12 +- filter/source/graphic/GraphicExportDialog.hxx | 12 +- filter/source/graphic/GraphicExportFilter.cxx | 8 +- filter/source/graphic/GraphicExportFilter.hxx | 8 +- filter/source/htmlfilterdetect/filterdetect.cxx | 10 +- filter/source/htmlfilterdetect/filterdetect.hxx | 10 +- filter/source/msfilter/msvbahelper.cxx | 12 +- filter/source/odfflatxml/OdfFlatXml.cxx | 8 +- filter/source/pdf/pdfdialog.cxx | 14 +- filter/source/pdf/pdfdialog.hxx | 14 +- filter/source/pdf/pdfexport.cxx | 8 +- filter/source/pdf/pdffilter.cxx | 14 +- filter/source/pdf/pdffilter.hxx | 14 +- filter/source/pdf/pdfinteract.cxx | 10 +- filter/source/pdf/pdfinteract.hxx | 10 +- filter/source/placeware/filter.cxx | 28 +- filter/source/svg/svgdialog.cxx | 16 +- filter/source/svg/svgdialog.hxx | 16 +- filter/source/svg/svgfilter.cxx | 10 +- filter/source/svg/svgfilter.hxx | 10 +- filter/source/svg/svgwriter.cxx | 2 +- filter/source/svg/svgwriter.hxx | 2 +- filter/source/svg/test/odfserializer.cxx | 32 +- filter/source/svg/test/svg2odf.cxx | 6 +- filter/source/t602/t602filter.cxx | 32 +- filter/source/t602/t602filter.hxx | 34 +- filter/source/textfilterdetect/filterdetect.cxx | 10 +- filter/source/textfilterdetect/filterdetect.hxx | 10 +- .../source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 16 +- .../source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 16 +- filter/source/xmlfilteradaptor/streamwrap.cxx | 6 +- filter/source/xmlfilteradaptor/streamwrap.hxx | 6 +- filter/source/xmlfilterdetect/filterdetect.cxx | 10 +- filter/source/xmlfilterdetect/filterdetect.hxx | 10 +- filter/source/xsltdialog/typedetectionimport.cxx | 16 +- filter/source/xsltdialog/typedetectionimport.hxx | 16 +- .../source/xsltdialog/xmlfilterdialogcomponent.cxx | 52 +- filter/source/xsltdialog/xmlfiltertestdialog.cxx | 8 +- filter/source/xsltfilter/LibXSLTTransformer.cxx | 18 +- filter/source/xsltfilter/LibXSLTTransformer.hxx | 18 +- filter/source/xsltfilter/XSLTFilter.cxx | 36 +- forms/source/component/Button.cxx | 44 +- forms/source/component/Button.hxx | 44 +- forms/source/component/CheckBox.cxx | 10 +- forms/source/component/CheckBox.hxx | 10 +- forms/source/component/Columns.cxx | 14 +- forms/source/component/Columns.hxx | 18 +- forms/source/component/ComboBox.cxx | 18 +- forms/source/component/ComboBox.hxx | 18 +- forms/source/component/Currency.cxx | 6 +- forms/source/component/Currency.hxx | 6 +- forms/source/component/DatabaseForm.cxx | 232 +++---- forms/source/component/DatabaseForm.hxx | 236 +++---- forms/source/component/Date.cxx | 8 +- forms/source/component/Date.hxx | 8 +- forms/source/component/Edit.cxx | 30 +- forms/source/component/Edit.hxx | 30 +- forms/source/component/EditBase.cxx | 6 +- forms/source/component/EditBase.hxx | 6 +- forms/source/component/EventThread.cxx | 4 +- forms/source/component/EventThread.hxx | 4 +- forms/source/component/File.cxx | 18 +- forms/source/component/File.hxx | 18 +- forms/source/component/Filter.cxx | 48 +- forms/source/component/Filter.hxx | 52 +- forms/source/component/FixedText.cxx | 8 +- forms/source/component/FixedText.hxx | 8 +- forms/source/component/FormComponent.cxx | 138 ++-- forms/source/component/FormattedField.cxx | 30 +- forms/source/component/FormattedField.hxx | 30 +- forms/source/component/FormattedFieldWrapper.cxx | 16 +- forms/source/component/FormattedFieldWrapper.hxx | 16 +- forms/source/component/FormsCollection.cxx | 20 +- forms/source/component/FormsCollection.hxx | 80 +-- forms/source/component/Grid.cxx | 48 +- forms/source/component/Grid.hxx | 46 +- forms/source/component/GroupBox.cxx | 10 +- forms/source/component/GroupBox.hxx | 10 +- forms/source/component/GroupManager.cxx | 10 +- forms/source/component/GroupManager.hxx | 10 +- forms/source/component/Hidden.cxx | 10 +- forms/source/component/Hidden.hxx | 10 +- forms/source/component/ImageButton.cxx | 20 +- forms/source/component/ImageButton.hxx | 22 +- forms/source/component/ImageControl.cxx | 38 +- forms/source/component/ImageControl.hxx | 38 +- forms/source/component/ListBox.cxx | 76 +-- forms/source/component/ListBox.hxx | 76 +-- forms/source/component/Numeric.cxx | 6 +- forms/source/component/Numeric.hxx | 6 +- forms/source/component/Pattern.cxx | 6 +- forms/source/component/Pattern.hxx | 6 +- forms/source/component/RadioButton.cxx | 14 +- forms/source/component/RadioButton.hxx | 14 +- forms/source/component/Time.cxx | 8 +- forms/source/component/Time.hxx | 8 +- forms/source/component/clickableimage.cxx | 36 +- forms/source/component/clickableimage.hxx | 38 +- 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/imgprod.cxx | 8 +- forms/source/component/imgprod.hxx | 8 +- forms/source/component/navigationbar.cxx | 14 +- forms/source/component/navigationbar.hxx | 14 +- forms/source/component/refvaluecomponent.cxx | 2 +- forms/source/component/refvaluecomponent.hxx | 2 +- forms/source/component/scrollbar.cxx | 8 +- forms/source/component/scrollbar.hxx | 2 +- forms/source/component/spinbutton.cxx | 8 +- forms/source/component/spinbutton.hxx | 2 +- forms/source/helper/formnavigation.cxx | 8 +- forms/source/helper/windowstateguard.cxx | 28 +- forms/source/inc/FormComponent.hxx | 164 ++--- forms/source/inc/InterfaceContainer.hxx | 72 +- forms/source/inc/formnavigation.hxx | 8 +- forms/source/inc/forms_module.hxx | 8 +- forms/source/misc/InterfaceContainer.cxx | 70 +- 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 | 20 +- forms/source/richtext/richtextcontrol.hxx | 20 +- forms/source/richtext/richtextmodel.cxx | 16 +- forms/source/richtext/richtextmodel.hxx | 10 +- forms/source/richtext/specialdispatchers.cxx | 2 +- forms/source/richtext/specialdispatchers.hxx | 2 +- 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 | 16 +- forms/source/xforms/binding.cxx | 40 +- forms/source/xforms/binding.hxx | 40 +- forms/source/xforms/collection.hxx | 22 +- forms/source/xforms/datatyperepository.cxx | 20 +- forms/source/xforms/datatyperepository.hxx | 20 +- forms/source/xforms/datatypes.cxx | 36 +- forms/source/xforms/datatypes.hxx | 38 +- forms/source/xforms/enumeration.cxx | 4 +- forms/source/xforms/enumeration.hxx | 4 +- forms/source/xforms/model.cxx | 46 +- forms/source/xforms/model.hxx | 106 +-- forms/source/xforms/model_ui.cxx | 46 +- forms/source/xforms/propertysetbase.cxx | 4 +- forms/source/xforms/propertysetbase.hxx | 4 +- forms/source/xforms/submission.cxx | 28 +- forms/source/xforms/submission.hxx | 28 +- forms/source/xforms/submission/submission.hxx | 10 +- forms/source/xforms/xformsevent.cxx | 22 +- forms/source/xforms/xformsevent.hxx | 22 +- forms/source/xforms/xpathlib/extension.cxx | 4 +- forms/source/xforms/xpathlib/extension.hxx | 4 +- formula/source/core/api/FormulaOpCodeMapperObj.cxx | 14 +- fpicker/source/office/OfficeFilePicker.cxx | 60 +- fpicker/source/office/OfficeFilePicker.hxx | 68 +- fpicker/source/office/OfficeFolderPicker.cxx | 24 +- fpicker/source/office/OfficeFolderPicker.hxx | 24 +- fpicker/source/office/commonpicker.cxx | 26 +- fpicker/source/office/commonpicker.hxx | 26 +- fpicker/source/office/fpinteraction.cxx | 2 +- fpicker/source/office/fpinteraction.hxx | 2 +- framework/inc/classes/actiontriggercontainer.hxx | 18 +- framework/inc/classes/actiontriggerpropertyset.hxx | 16 +- .../classes/actiontriggerseparatorpropertyset.hxx | 16 +- framework/inc/classes/imagewrapper.hxx | 8 +- framework/inc/classes/menumanager.hxx | 4 +- framework/inc/classes/propertysethelper.hxx | 20 +- .../inc/classes/rootactiontriggercontainer.hxx | 38 +- framework/inc/dispatch/closedispatcher.hxx | 12 +- .../inc/dispatch/dispatchinformationprovider.hxx | 4 +- framework/inc/dispatch/dispatchprovider.hxx | 4 +- framework/inc/dispatch/interceptionhelper.hxx | 10 +- framework/inc/dispatch/mailtodispatcher.hxx | 12 +- framework/inc/dispatch/menudispatcher.hxx | 10 +- framework/inc/dispatch/oxt_handler.hxx | 10 +- framework/inc/dispatch/popupmenudispatcher.hxx | 16 +- framework/inc/dispatch/servicehandler.hxx | 12 +- framework/inc/dispatch/startmoduledispatcher.hxx | 12 +- framework/inc/dispatch/systemexec.hxx | 12 +- .../inc/helper/dockingareadefaultacceptor.hxx | 6 +- framework/inc/helper/mischelper.hxx | 18 +- framework/inc/helper/ocomponentaccess.hxx | 6 +- framework/inc/helper/ocomponentenumeration.hxx | 6 +- framework/inc/helper/oframes.hxx | 14 +- framework/inc/helper/persistentwindowstate.hxx | 6 +- framework/inc/helper/propertysetcontainer.hxx | 16 +- framework/inc/helper/statusindicator.hxx | 10 +- framework/inc/helper/statusindicatorfactory.hxx | 12 +- framework/inc/helper/tagwindowasmodified.hxx | 8 +- framework/inc/helper/titlebarupdate.hxx | 8 +- .../inc/helper/uiconfigelementwrapperbase.hxx | 40 +- framework/inc/helper/uielementwrapperbase.hxx | 26 +- framework/inc/helper/vclstatusindicator.hxx | 10 +- framework/inc/interaction/quietinteraction.hxx | 2 +- framework/inc/jobs/helponstartup.hxx | 4 +- framework/inc/jobs/job.hxx | 12 +- framework/inc/jobs/shelljob.hxx | 2 +- framework/inc/macros/xinterface.hxx | 6 +- framework/inc/macros/xserviceinfo.hxx | 12 +- framework/inc/macros/xtypeprovider.hxx | 10 +- framework/inc/recording/dispatchrecorder.hxx | 20 +- .../inc/recording/dispatchrecordersupplier.hxx | 6 +- framework/inc/services/desktop.hxx | 98 +-- framework/inc/services/dispatchhelper.hxx | 6 +- framework/inc/services/layoutmanager.hxx | 98 +-- framework/inc/services/license.hxx | 8 +- framework/inc/services/uriabbreviation.hxx | 2 +- framework/inc/tabwin/tabwindow.hxx | 52 +- framework/inc/tabwin/tabwinfactory.hxx | 4 +- .../inc/uiconfiguration/graphicnameaccess.hxx | 10 +- framework/inc/uiconfiguration/imagemanager.hxx | 42 +- .../inc/uiconfiguration/moduleimagemanager.hxx | 36 +- 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 | 28 +- .../inc/uielement/dropdownboxtoolbarcontroller.hxx | 2 +- framework/inc/uielement/edittoolbarcontroller.hxx | 2 +- framework/inc/uielement/fontmenucontroller.hxx | 8 +- framework/inc/uielement/fontsizemenucontroller.hxx | 6 +- framework/inc/uielement/footermenucontroller.hxx | 6 +- .../inc/uielement/genericstatusbarcontroller.hxx | 6 +- .../inc/uielement/generictoolbarcontroller.hxx | 10 +- framework/inc/uielement/headermenucontroller.hxx | 6 +- .../inc/uielement/imagebuttontoolbarcontroller.hxx | 2 +- framework/inc/uielement/itemcontainer.hxx | 14 +- .../inc/uielement/langselectionmenucontroller.hxx | 8 +- framework/inc/uielement/macrosmenucontroller.hxx | 4 +- framework/inc/uielement/menubarmanager.hxx | 22 +- framework/inc/uielement/menubarwrapper.hxx | 18 +- framework/inc/uielement/newmenucontroller.hxx | 10 +- framework/inc/uielement/progressbarwrapper.hxx | 8 +- framework/inc/uielement/rootitemcontainer.hxx | 28 +- .../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 | 18 +- framework/inc/uielement/toolbarsmenucontroller.hxx | 12 +- framework/inc/uielement/toolbarwrapper.hxx | 18 +- framework/inc/uielement/uicommanddescription.hxx | 16 +- .../configurationaccessfactorymanager.hxx | 8 +- framework/inc/uifactory/factoryconfiguration.hxx | 8 +- framework/inc/uifactory/menubarfactory.hxx | 8 +- .../inc/xml/acceleratorconfigurationreader.hxx | 16 +- framework/inc/xml/imagesdocumenthandler.hxx | 12 +- framework/inc/xml/menudocumenthandler.hxx | 56 +- framework/inc/xml/saxnamespacefilter.hxx | 16 +- framework/inc/xml/statusbardocumenthandler.hxx | 16 +- framework/inc/xml/toolboxdocumenthandler.hxx | 16 +- .../accelerators/acceleratorconfiguration.cxx | 86 +-- .../documentacceleratorconfiguration.cxx | 14 +- .../globalacceleratorconfiguration.cxx | 10 +- .../moduleacceleratorconfiguration.cxx | 10 +- framework/source/classes/menumanager.cxx | 6 +- framework/source/dispatch/closedispatcher.cxx | 12 +- .../dispatch/dispatchinformationprovider.cxx | 4 +- framework/source/dispatch/dispatchprovider.cxx | 4 +- framework/source/dispatch/interceptionhelper.cxx | 10 +- framework/source/dispatch/loaddispatcher.cxx | 10 +- framework/source/dispatch/mailtodispatcher.cxx | 12 +- framework/source/dispatch/menudispatcher.cxx | 10 +- framework/source/dispatch/oxt_handler.cxx | 6 +- framework/source/dispatch/popupmenudispatcher.cxx | 22 +- framework/source/dispatch/servicehandler.cxx | 12 +- .../source/dispatch/startmoduledispatcher.cxx | 12 +- framework/source/dispatch/systemexec.cxx | 12 +- .../source/fwe/classes/actiontriggercontainer.cxx | 18 +- .../fwe/classes/actiontriggerpropertyset.cxx | 16 +- .../classes/actiontriggerseparatorpropertyset.cxx | 16 +- framework/source/fwe/classes/imagewrapper.cxx | 8 +- .../fwe/classes/rootactiontriggercontainer.cxx | 38 +- framework/source/fwe/dispatch/interaction.cxx | 24 +- framework/source/fwe/helper/documentundoguard.cxx | 48 +- .../source/fwe/helper/propertysetcontainer.cxx | 14 +- framework/source/fwe/helper/titlehelper.cxx | 16 +- .../interaction/preventduplicateinteraction.cxx | 6 +- framework/source/fwe/xml/menudocumenthandler.cxx | 46 +- framework/source/fwe/xml/saxnamespacefilter.cxx | 16 +- .../source/fwe/xml/statusbardocumenthandler.cxx | 16 +- .../source/fwe/xml/toolboxdocumenthandler.cxx | 16 +- framework/source/fwi/classes/propertysethelper.cxx | 20 +- .../source/fwi/uielement/constitemcontainer.cxx | 38 +- framework/source/fwi/uielement/itemcontainer.cxx | 12 +- .../source/fwi/uielement/rootitemcontainer.cxx | 26 +- .../source/helper/dockingareadefaultacceptor.cxx | 6 +- framework/source/helper/ocomponentaccess.cxx | 6 +- framework/source/helper/ocomponentenumeration.cxx | 6 +- framework/source/helper/oframes.cxx | 14 +- framework/source/helper/persistentwindowstate.cxx | 6 +- framework/source/helper/statusindicator.cxx | 10 +- framework/source/helper/statusindicatorfactory.cxx | 6 +- framework/source/helper/tagwindowasmodified.cxx | 8 +- framework/source/helper/titlebarupdate.cxx | 8 +- .../source/helper/uiconfigelementwrapperbase.cxx | 34 +- framework/source/helper/uielementwrapperbase.cxx | 22 +- framework/source/helper/vclstatusindicator.cxx | 10 +- .../inc/accelerators/acceleratorconfiguration.hxx | 86 +-- framework/source/inc/dispatch/loaddispatcher.hxx | 10 +- framework/source/interaction/quietinteraction.cxx | 2 +- framework/source/jobs/helponstartup.cxx | 4 +- framework/source/jobs/job.cxx | 12 +- framework/source/jobs/jobdispatch.cxx | 34 +- framework/source/jobs/jobexecutor.cxx | 30 +- framework/source/jobs/shelljob.cxx | 2 +- framework/source/layoutmanager/layoutmanager.cxx | 92 +-- .../source/layoutmanager/toolbarlayoutmanager.cxx | 32 +- .../source/layoutmanager/toolbarlayoutmanager.hxx | 32 +- framework/source/loadenv/loadenv.cxx | 16 +- framework/source/recording/dispatchrecorder.cxx | 20 +- .../source/recording/dispatchrecordersupplier.cxx | 6 +- .../services/ContextChangeEventMultiplexer.cxx | 32 +- framework/source/services/autorecovery.cxx | 50 +- framework/source/services/desktop.cxx | 98 +-- framework/source/services/dispatchhelper.cxx | 6 +- framework/source/services/frame.cxx | 242 +++---- framework/source/services/license.cxx | 8 +- framework/source/services/modulemanager.cxx | 48 +- framework/source/services/pathsettings.cxx | 146 ++-- framework/source/services/sessionlistener.cxx | 38 +- framework/source/services/substitutepathvars.cxx | 18 +- framework/source/services/tabwindowservice.cxx | 50 +- framework/source/services/taskcreatorsrv.cxx | 14 +- framework/source/services/uriabbreviation.cxx | 2 +- framework/source/services/urltransformer.cxx | 22 +- framework/source/tabwin/tabwindow.cxx | 52 +- framework/source/tabwin/tabwinfactory.cxx | 4 +- .../source/uiconfiguration/globalsettings.cxx | 16 +- .../source/uiconfiguration/graphicnameaccess.cxx | 10 +- framework/source/uiconfiguration/imagemanager.cxx | 36 +- .../source/uiconfiguration/moduleimagemanager.cxx | 36 +- .../source/uiconfiguration/moduleuicfgsupplier.cxx | 10 +- .../moduleuiconfigurationmanager.cxx | 98 +-- .../uiconfiguration/uicategorydescription.cxx | 42 +- .../uiconfiguration/uiconfigurationmanager.cxx | 98 +-- .../uiconfiguration/windowstateconfiguration.cxx | 74 +-- .../source/uielement/addonstoolbarmanager.cxx | 2 +- .../source/uielement/addonstoolbarwrapper.cxx | 6 +- .../source/uielement/buttontoolbarcontroller.cxx | 26 +- .../source/uielement/comboboxtoolbarcontroller.cxx | 2 +- .../source/uielement/complextoolbarcontroller.cxx | 6 +- .../source/uielement/controlmenucontroller.cxx | 26 +- .../uielement/dropdownboxtoolbarcontroller.cxx | 2 +- .../source/uielement/edittoolbarcontroller.cxx | 2 +- framework/source/uielement/fontmenucontroller.cxx | 8 +- .../source/uielement/fontsizemenucontroller.cxx | 6 +- .../uielement/genericstatusbarcontroller.cxx | 6 +- .../source/uielement/generictoolbarcontroller.cxx | 10 +- .../source/uielement/headermenucontroller.cxx | 6 +- .../uielement/imagebuttontoolbarcontroller.cxx | 2 +- .../uielement/langselectionmenucontroller.cxx | 8 +- .../uielement/langselectionstatusbarcontroller.cxx | 16 +- .../source/uielement/macrosmenucontroller.cxx | 4 +- framework/source/uielement/menubarmanager.cxx | 26 +- framework/source/uielement/menubarwrapper.cxx | 18 +- framework/source/uielement/newmenucontroller.cxx | 10 +- .../source/uielement/objectmenucontroller.cxx | 14 +- .../source/uielement/popuptoolbarcontroller.cxx | 28 +- framework/source/uielement/progressbarwrapper.cxx | 8 +- .../source/uielement/recentfilesmenucontroller.cxx | 30 +- .../uielement/spinfieldtoolbarcontroller.cxx | 2 +- framework/source/uielement/statusbaritem.cxx | 34 +- framework/source/uielement/statusbarmanager.cxx | 16 +- framework/source/uielement/statusbarwrapper.cxx | 8 +- .../uielement/statusindicatorinterfacewrapper.cxx | 10 +- .../uielement/togglebuttontoolbarcontroller.cxx | 4 +- framework/source/uielement/toolbarmanager.cxx | 22 +- .../source/uielement/toolbarsmenucontroller.cxx | 12 +- framework/source/uielement/toolbarwrapper.cxx | 18 +- .../source/uielement/uicommanddescription.cxx | 46 +- .../source/uifactory/addonstoolbarfactory.cxx | 10 +- .../source/uifactory/factoryconfiguration.cxx | 8 +- framework/source/uifactory/menubarfactory.cxx | 2 +- framework/source/uifactory/statusbarfactory.cxx | 10 +- framework/source/uifactory/toolbarfactory.cxx | 10 +- framework/source/uifactory/uicontrollerfactory.cxx | 48 +- .../source/uifactory/uielementfactorymanager.cxx | 34 +- .../uifactory/windowcontentfactorymanager.cxx | 14 +- .../source/xml/acceleratorconfigurationreader.cxx | 16 +- framework/source/xml/imagesdocumenthandler.cxx | 12 +- hwpfilter/source/attributes.cxx | 12 +- hwpfilter/source/attributes.hxx | 12 +- hwpfilter/source/hwpreader.cxx | 2 +- hwpfilter/source/hwpreader.hxx | 32 +- i18npool/inc/breakiteratorImpl.hxx | 46 +- i18npool/inc/breakiterator_cjk.hxx | 8 +- i18npool/inc/breakiterator_ctl.hxx | 6 +- i18npool/inc/breakiterator_unicode.hxx | 22 +- i18npool/inc/calendarImpl.hxx | 58 +- i18npool/inc/calendar_gregorian.hxx | 60 +- i18npool/inc/calendar_jewish.hxx | 2 +- i18npool/inc/cclass_unicode.hxx | 26 +- i18npool/inc/chaptercollator.hxx | 10 +- i18npool/inc/characterclassificationImpl.hxx | 26 +- i18npool/inc/collatorImpl.hxx | 20 +- i18npool/inc/collator_unicode.hxx | 20 +- i18npool/inc/defaultnumberingprovider.hxx | 20 +- i18npool/inc/indexentrysupplier.hxx | 24 +- i18npool/inc/indexentrysupplier_asian.hxx | 8 +- i18npool/inc/indexentrysupplier_common.hxx | 24 +- i18npool/inc/indexentrysupplier_default.hxx | 8 +- i18npool/inc/indexentrysupplier_ja_phonetic.hxx | 8 +- i18npool/inc/inputsequencechecker.hxx | 10 +- i18npool/inc/inputsequencechecker_hi.hxx | 4 +- i18npool/inc/inputsequencechecker_th.hxx | 4 +- i18npool/inc/localedata.hxx | 36 +- i18npool/inc/nativenumbersupplier.hxx | 14 +- i18npool/inc/numberformatcode.hxx | 14 +- i18npool/inc/ordinalsuffix.hxx | 8 +- i18npool/inc/textToPronounce_zh.hxx | 10 +- i18npool/inc/textconversion.hxx | 30 +- i18npool/inc/textconversionImpl.hxx | 14 +- i18npool/inc/transliterationImpl.hxx | 38 +- i18npool/inc/transliteration_Ignore.hxx | 20 +- i18npool/inc/transliteration_Numeric.hxx | 12 +- i18npool/inc/transliteration_OneToOne.hxx | 16 +- i18npool/inc/transliteration_body.hxx | 18 +- i18npool/inc/transliteration_caseignore.hxx | 12 +- i18npool/inc/transliteration_commonclass.hxx | 38 +- i18npool/inc/unoscripttypedetector.hxx | 18 +- .../source/breakiterator/breakiteratorImpl.cxx | 46 +- .../source/breakiterator/breakiterator_cjk.cxx | 8 +- .../source/breakiterator/breakiterator_ctl.cxx | 6 +- .../source/breakiterator/breakiterator_unicode.cxx | 22 +- i18npool/source/calendar/calendarImpl.cxx | 58 +- i18npool/source/calendar/calendar_gregorian.cxx | 60 +- i18npool/source/calendar/calendar_jewish.cxx | 2 +- .../characterclassification/cclass_unicode.cxx | 26 +- .../characterclassificationImpl.cxx | 26 +- .../unoscripttypedetector.cxx | 18 +- i18npool/source/collator/chaptercollator.cxx | 10 +- i18npool/source/collator/collatorImpl.cxx | 20 +- i18npool/source/collator/collator_unicode.cxx | 12 +- .../defaultnumberingprovider.cxx | 20 +- i18npool/source/indexentry/indexentrysupplier.cxx | 24 +- .../source/indexentry/indexentrysupplier_asian.cxx | 8 +- .../indexentry/indexentrysupplier_common.cxx | 24 +- .../indexentry/indexentrysupplier_default.cxx | 8 +- .../indexentry/indexentrysupplier_ja_phonetic.cxx | 14 +- .../source/inputchecker/inputsequencechecker.cxx | 10 +- .../inputchecker/inputsequencechecker_hi.cxx | 4 +- .../inputchecker/inputsequencechecker_th.cxx | 4 +- i18npool/source/localedata/localedata.cxx | 52 +- i18npool/source/localedata/saxparser.cxx | 44 +- .../source/nativenumber/nativenumbersupplier.cxx | 14 +- .../source/numberformatcode/numberformatcode.cxx | 14 +- i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 8 +- i18npool/source/search/textsearch.cxx | 12 +- i18npool/source/search/textsearch.hxx | 12 +- i18npool/source/textconversion/textconversion.cxx | 6 +- .../source/textconversion/textconversionImpl.cxx | 14 +- .../source/textconversion/textconversion_ko.cxx | 8 +- .../source/textconversion/textconversion_zh.cxx | 8 +- .../transliteration/fullwidthToHalfwidth.cxx | 12 +- .../transliteration/halfwidthToFullwidth.cxx | 12 +- .../ignoreIandEfollowedByYa_ja_JP.cxx | 2 +- .../transliteration/ignoreIterationMark_ja_JP.cxx | 2 +- i18npool/source/transliteration/ignoreKana.cxx | 6 +- .../ignoreKiKuFollowedBySa_ja_JP.cxx | 2 +- .../ignoreProlongedSoundMark_ja_JP.cxx | 2 +- .../source/transliteration/ignoreSize_ja_JP.cxx | 6 +- i18npool/source/transliteration/ignoreWidth.cxx | 6 +- .../source/transliteration/textToPronounce_zh.cxx | 10 +- .../source/transliteration/transliterationImpl.cxx | 38 +- .../transliteration/transliteration_Ignore.cxx | 12 +- .../transliteration/transliteration_Numeric.cxx | 12 +- .../transliteration/transliteration_OneToOne.cxx | 12 +- .../transliteration/transliteration_body.cxx | 18 +- .../transliteration/transliteration_caseignore.cxx | 12 +- .../transliteration_commonclass.cxx | 26 +- include/basegfx/tools/unopolypolygon.hxx | 36 +- include/basic/modsizeexceeded.hxx | 4 +- include/canvas/base/cachedprimitivebase.hxx | 8 +- include/canvas/parametricpolypolygon.hxx | 14 +- include/comphelper/ChainablePropertySet.hxx | 32 +- include/comphelper/ChainablePropertySetInfo.hxx | 6 +- include/comphelper/MasterPropertySet.hxx | 32 +- include/comphelper/MasterPropertySetInfo.hxx | 6 +- include/comphelper/SelectionMultiplex.hxx | 4 +- include/comphelper/SettingsHelper.hxx | 26 +- include/comphelper/accessiblecomponenthelper.hxx | 20 +- include/comphelper/accessiblecontexthelper.hxx | 24 +- include/comphelper/accessiblekeybindinghelper.hxx | 4 +- include/comphelper/accessibleselectionhelper.hxx | 14 +- include/comphelper/accessibletexthelper.hxx | 20 +- include/comphelper/accessiblewrapper.hxx | 48 +- include/comphelper/accimplaccess.hxx | 2 +- include/comphelper/attributelist.hxx | 12 +- include/comphelper/containermultiplexer.hxx | 8 +- include/comphelper/docpasswordrequest.hxx | 8 +- include/comphelper/enumhelper.hxx | 16 +- include/comphelper/evtlistenerhlp.hxx | 2 +- include/comphelper/ihwrapnofilter.hxx | 10 +- include/comphelper/implbase_var.hxx | 30 +- include/comphelper/interaction.hxx | 8 +- include/comphelper/numberedcollection.hxx | 8 +- include/comphelper/ofopxmlhelper.hxx | 16 +- include/comphelper/oslfile2streamwrap.hxx | 16 +- include/comphelper/propagg.hxx | 28 +- include/comphelper/propertycontainer.hxx | 4 +- include/comphelper/propertysethelper.hxx | 32 +- include/comphelper/propertysetinfo.hxx | 6 +- include/comphelper/propertystatecontainer.hxx | 10 +- include/comphelper/propmultiplex.hxx | 4 +- include/comphelper/propstate.hxx | 12 +- include/comphelper/proxyaggregation.hxx | 10 +- include/comphelper/scoped_disposing_ptr.hxx | 6 +- include/comphelper/seekableinput.hxx | 16 +- include/comphelper/seqstream.hxx | 22 +- include/comphelper/servicehelper.hxx | 6 +- include/comphelper/serviceinfohelper.hxx | 4 +- include/comphelper/uno3.hxx | 26 +- include/comphelper/weak.hxx | 6 +- include/connectivity/BlobHelper.hxx | 10 +- include/connectivity/CommonTools.hxx | 12 +- include/connectivity/ConnectionWrapper.hxx | 6 +- include/connectivity/PColumn.hxx | 2 +- include/connectivity/ParameterCont.hxx | 2 +- include/connectivity/TTableHelper.hxx | 6 +- include/connectivity/conncleanup.hxx | 10 +- include/connectivity/paramwrapper.hxx | 14 +- include/connectivity/sdbcx/VCatalog.hxx | 8 +- include/connectivity/sdbcx/VCollection.hxx | 40 +- 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/compbase1.hxx | 26 +- include/cppuhelper/compbase10.hxx | 26 +- include/cppuhelper/compbase11.hxx | 26 +- 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 | 18 +- include/cppuhelper/component.hxx | 14 +- include/cppuhelper/implbase1.hxx | 26 +- include/cppuhelper/implbase10.hxx | 20 +- include/cppuhelper/implbase11.hxx | 20 +- include/cppuhelper/implbase12.hxx | 20 +- include/cppuhelper/implbase13.hxx | 20 +- include/cppuhelper/implbase2.hxx | 26 +- include/cppuhelper/implbase3.hxx | 24 +- include/cppuhelper/implbase4.hxx | 24 +- include/cppuhelper/implbase5.hxx | 26 +- include/cppuhelper/implbase6.hxx | 26 +- include/cppuhelper/implbase7.hxx | 26 +- include/cppuhelper/implbase8.hxx | 20 +- include/cppuhelper/implbase9.hxx | 26 +- include/cppuhelper/implbase_ex_post.hxx | 20 +- include/cppuhelper/propertysetmixin.hxx | 2 +- include/cppuhelper/propshlp.hxx | 32 +- include/cppuhelper/weak.hxx | 4 +- include/cppuhelper/weakagg.hxx | 6 +- include/dbaccess/dbaundomanager.hxx | 44 +- include/dbaccess/dbsubcomponentcontroller.hxx | 22 +- include/dbaccess/genericcontroller.hxx | 78 +-- .../drawinglayer/primitive2d/baseprimitive2d.hxx | 4 +- .../drawinglayer/primitive3d/baseprimitive3d.hxx | 4 +- include/editeng/AccessibleComponentBase.hxx | 26 +- include/editeng/AccessibleContextBase.hxx | 36 +- include/editeng/AccessibleEditableTextPara.hxx | 118 ++-- include/editeng/AccessibleImageBullet.hxx | 52 +- include/editeng/AccessibleSelectionBase.hxx | 14 +- include/editeng/AccessibleStaticTextBase.hxx | 44 +- include/editeng/UnoForbiddenCharsTable.hxx | 12 +- include/editeng/unofield.hxx | 42 +- include/editeng/unonrule.hxx | 20 +- include/editeng/unopracc.hxx | 14 +- include/editeng/unotext.hxx | 216 +++--- include/filter/msfilter/msvbahelper.hxx | 12 +- include/formula/FormulaOpCodeMapperObj.hxx | 14 +- include/framework/preventduplicateinteraction.hxx | 6 +- include/framework/titlehelper.hxx | 16 +- include/linguistic/hyphdta.hxx | 20 +- include/linguistic/lngprophelp.hxx | 14 +- include/linguistic/misc.hxx | 6 +- include/linguistic/spelldta.hxx | 14 +- include/oox/core/contexthandler.hxx | 14 +- include/oox/core/contexthandler2.hxx | 8 +- include/oox/core/fasttokenhandler.hxx | 14 +- include/oox/core/filterbase.hxx | 16 +- include/oox/core/filterdetect.hxx | 28 +- include/oox/core/fragmenthandler.hxx | 20 +- include/oox/core/fragmenthandler2.hxx | 12 +- include/oox/core/relationshandler.hxx | 2 +- include/oox/ppt/pptimport.hxx | 2 +- include/oox/vml/vmlinputstream.hxx | 10 +- include/sax/fastattribs.hxx | 14 +- include/sax/fastparser.hxx | 20 +- include/sax/tools/documenthandleradapter.hxx | 42 +- include/sfx2/DocumentMetadataAccess.hxx | 32 +- include/sfx2/Metadatable.hxx | 12 +- include/sfx2/docstoragemodifylistener.hxx | 4 +- include/sfx2/sfxbasecontroller.hxx | 64 +- include/sfx2/sfxbasemodel.hxx | 248 +++---- include/sfx2/sfxstatuslistener.hxx | 10 +- include/sfx2/sfxuno.hxx | 6 +- include/sfx2/sidebar/SidebarPanelBase.hxx | 20 +- include/sfx2/sidebar/Theme.hxx | 20 +- include/sfx2/stbitem.hxx | 22 +- include/sfx2/tbxctrl.hxx | 42 +- include/sfx2/unoctitm.hxx | 20 +- include/svl/itemprop.hxx | 12 +- include/svl/numuno.hxx | 6 +- include/svl/strmadpt.hxx | 18 +- include/svl/style.hxx | 2 +- include/svtools/accessibleruler.hxx | 52 +- include/svtools/accessibletableprovider.hxx | 2 +- include/svtools/cliplistener.hxx | 4 +- include/svtools/dialogclosedlistener.hxx | 4 +- include/svtools/framestatuslistener.hxx | 14 +- include/svtools/generictoolboxcontroller.hxx | 6 +- include/svtools/genericunodialog.hxx | 20 +- include/svtools/javacontext.hxx | 4 +- include/svtools/javainteractionhandler.hxx | 4 +- include/svtools/openfiledroptargetlistener.hxx | 12 +- include/svtools/popupmenucontrollerbase.hxx | 34 +- include/svtools/popupwindowcontroller.hxx | 24 +- include/svtools/statusbarcontroller.hxx | 30 +- include/svtools/toolboxcontroller.hxx | 32 +- include/svtools/transfer.hxx | 44 +- include/svtools/unoevent.hxx | 20 +- include/svtools/vclxaccessibleheaderbar.hxx | 10 +- include/svtools/vclxaccessibleheaderbaritem.hxx | 42 +- include/svx/AccessibleControlShape.hxx | 26 +- include/svx/AccessibleGraphicShape.hxx | 16 +- include/svx/AccessibleOLEShape.hxx | 18 +- include/svx/AccessibleShape.hxx | 108 +-- include/svx/AccessibleSvxFindReplaceDialog.hxx | 4 +- include/svx/AccessibleTableShape.hxx | 164 ++--- include/svx/SmartTagMgr.hxx | 6 +- include/svx/fmdmod.hxx | 6 +- include/svx/fmdpage.hxx | 12 +- include/svx/fmgridif.hxx | 240 +++---- include/svx/fmsrcimp.hxx | 4 +- include/svx/fmtools.hxx | 2 +- include/svx/sidebar/SelectionChangeHandler.hxx | 4 +- include/svx/tbcontrl.hxx | 6 +- include/svx/tbxalign.hxx | 8 +- include/svx/tbxcustomshapes.hxx | 8 +- include/svx/unomod.hxx | 6 +- include/svx/unomodel.hxx | 26 +- include/svx/unopage.hxx | 26 +- include/svx/unopool.hxx | 14 +- include/svx/unoshape.hxx | 282 ++++---- include/svx/xmleohlp.hxx | 12 +- include/svx/xmlgrhlp.hxx | 8 +- include/toolkit/awt/animatedimagespeer.hxx | 22 +- include/toolkit/awt/vclxaccessiblecomponent.hxx | 42 +- 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 | 12 +- include/toolkit/awt/vclxprinter.hxx | 92 +-- 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 | 128 ++-- include/toolkit/awt/vclxwindows.hxx | 734 ++++++++++----------- .../toolkit/controls/accessiblecontrolcontext.hxx | 26 +- include/toolkit/controls/animatedimages.hxx | 36 +- .../toolkit/controls/controlmodelcontainerbase.hxx | 100 +-- include/toolkit/controls/dialogcontrol.hxx | 158 ++--- include/toolkit/controls/eventcontainer.hxx | 20 +- include/toolkit/controls/formattedcontrol.hxx | 12 +- include/toolkit/controls/geometrycontrolmodel.hxx | 20 +- .../toolkit/controls/geometrycontrolmodel_impl.hxx | 2 +- include/toolkit/controls/roadmapcontrol.hxx | 50 +- include/toolkit/controls/roadmapentry.hxx | 8 +- include/toolkit/controls/stdtabcontroller.hxx | 26 +- include/toolkit/controls/stdtabcontrollermodel.hxx | 30 +- include/toolkit/controls/tabpagecontainer.hxx | 50 +- include/toolkit/controls/tabpagemodel.hxx | 30 +- include/toolkit/controls/tkscrollbar.hxx | 50 +- include/toolkit/controls/unocontrol.hxx | 114 ++-- include/toolkit/controls/unocontrolcontainer.hxx | 44 +- .../toolkit/controls/unocontrolcontainermodel.hxx | 4 +- include/toolkit/controls/unocontrolmodel.hxx | 44 +- include/toolkit/controls/unocontrols.hxx | 706 ++++++++++---------- include/toolkit/helper/listenermultiplexer.hxx | 110 +-- include/toolkit/helper/macros.hxx | 34 +- include/ucbhelper/activedatasink.hxx | 4 +- include/ucbhelper/activedatastreamer.hxx | 4 +- include/ucbhelper/commandenvironment.hxx | 4 +- include/ucbhelper/contenthelper.hxx | 46 +- include/ucbhelper/contentidentifier.hxx | 10 +- include/ucbhelper/contentinfo.hxx | 16 +- include/ucbhelper/fd_inputstream.hxx | 16 +- include/ucbhelper/interactionrequest.hxx | 96 +-- include/ucbhelper/interceptedinteraction.hxx | 2 +- include/ucbhelper/macros.hxx | 24 +- include/ucbhelper/propertyvalueset.hxx | 42 +- include/ucbhelper/providerhelper.hxx | 10 +- include/ucbhelper/resultset.hxx | 106 +-- include/ucbhelper/resultsethelper.hxx | 14 +- include/ucbhelper/resultsetmetadata.hxx | 42 +- include/ucbhelper/std_inputstream.hxx | 18 +- include/ucbhelper/std_outputstream.hxx | 8 +- include/unotools/accessiblerelationsethelper.hxx | 12 +- include/unotools/accessiblestatesethelper.hxx | 12 +- include/unotools/eventcfg.hxx | 14 +- include/unotools/progresshandlerwrap.hxx | 6 +- include/unotools/streamhelper.hxx | 16 +- include/unotools/streamwrap.hxx | 42 +- include/unotools/xmlaccelcfg.hxx | 18 +- include/vbahelper/vbaapplicationbase.hxx | 34 +- include/vbahelper/vbacollectionimpl.hxx | 30 +- include/vbahelper/vbadialogbase.hxx | 2 +- include/vbahelper/vbadialogsbase.hxx | 4 +- include/vbahelper/vbadocumentbase.hxx | 20 +- include/vbahelper/vbaeventshelperbase.hxx | 10 +- include/vbahelper/vbafontbase.hxx | 44 +- include/vbahelper/vbaglobalbase.hxx | 6 +- include/vbahelper/vbapagesetupbase.hxx | 20 +- include/vbahelper/vbapropvalue.hxx | 6 +- include/vbahelper/vbashape.hxx | 82 +-- include/vbahelper/vbashaperange.hxx | 56 +- include/vbahelper/vbashapes.hxx | 10 +- include/vbahelper/vbatextframe.hxx | 22 +- include/vbahelper/vbawindowbase.hxx | 20 +- include/vcl/dndhelp.hxx | 26 +- include/vcl/edit.hxx | 12 +- include/vcl/textview.hxx | 12 +- include/vcl/unohelp2.hxx | 8 +- include/xmloff/XMLEmbeddedObjectExportFilter.hxx | 34 +- include/xmloff/attrlist.hxx | 16 +- include/xmloff/unoatrcn.hxx | 24 +- include/xmloff/xmlexp.hxx | 20 +- include/xmloff/xmlimp.hxx | 38 +- include/xmloff/xmlmetae.hxx | 16 +- include/xmlscript/xml_helper.hxx | 12 +- io/source/TextInputStream/TextInputStream.cxx | 56 +- io/source/TextOutputStream/TextOutputStream.cxx | 40 +- io/source/acceptor/acc_pipe.cxx | 20 +- io/source/acceptor/acc_socket.cxx | 28 +- io/source/acceptor/acceptor.cxx | 20 +- io/source/connector/connector.cxx | 16 +- io/source/connector/connector.hxx | 24 +- io/source/connector/ctr_pipe.cxx | 10 +- io/source/connector/ctr_socket.cxx | 14 +- io/source/stm/odata.cxx | 300 ++++----- io/source/stm/omark.cxx | 144 ++-- io/source/stm/opipe.cxx | 60 +- io/source/stm/opump.cxx | 60 +- javaunohelper/source/vm.cxx | 8 +- .../source/hyphenator/hyphen/hyphenimp.cxx | 30 +- .../source/hyphenator/hyphen/hyphenimp.hxx | 30 +- .../source/languageguessing/guesslang.cxx | 36 +- .../source/spellcheck/spell/sspellimp.cxx | 28 +- .../source/spellcheck/spell/sspellimp.hxx | 28 +- .../source/thesaurus/libnth/nthesdta.cxx | 4 +- .../source/thesaurus/libnth/nthesdta.hxx | 4 +- .../source/thesaurus/libnth/nthesimp.cxx | 22 +- .../source/thesaurus/libnth/nthesimp.hxx | 22 +- linguistic/inc/iprcache.hxx | 6 +- linguistic/source/convdic.cxx | 38 +- linguistic/source/convdic.hxx | 38 +- linguistic/source/convdiclist.cxx | 52 +- linguistic/source/convdiclist.hxx | 20 +- linguistic/source/convdicxml.cxx | 4 +- linguistic/source/convdicxml.hxx | 4 +- linguistic/source/dicimp.cxx | 52 +- linguistic/source/dicimp.hxx | 52 +- linguistic/source/dlistimp.cxx | 44 +- linguistic/source/dlistimp.hxx | 36 +- linguistic/source/gciterator.cxx | 28 +- linguistic/source/gciterator.hxx | 28 +- linguistic/source/hhconvdic.cxx | 8 +- linguistic/source/hhconvdic.hxx | 8 +- linguistic/source/hyphdsp.cxx | 10 +- linguistic/source/hyphdsp.hxx | 10 +- linguistic/source/hyphdta.cxx | 20 +- linguistic/source/iprcache.cxx | 6 +- linguistic/source/lngopt.cxx | 34 +- linguistic/source/lngopt.hxx | 98 +-- linguistic/source/lngprophelp.cxx | 14 +- linguistic/source/lngsvcmgr.cxx | 44 +- linguistic/source/lngsvcmgr.hxx | 32 +- linguistic/source/misc.cxx | 6 +- linguistic/source/spelldsp.cxx | 16 +- linguistic/source/spelldsp.hxx | 16 +- linguistic/source/spelldta.cxx | 14 +- linguistic/source/thesdsp.cxx | 6 +- linguistic/source/thesdsp.hxx | 6 +- .../source/filter/LotusWordProImportFilter.cxx | 16 +- .../source/filter/LotusWordProImportFilter.hxx | 16 +- lotuswordpro/source/filter/lwpfilter.cxx | 18 +- lotuswordpro/source/filter/lwpfilter.hxx | 18 +- mysqlc/source/mysqlc_connection.cxx | 48 +- mysqlc/source/mysqlc_connection.hxx | 48 +- mysqlc/source/mysqlc_databasemetadata.cxx | 298 ++++----- mysqlc/source/mysqlc_databasemetadata.hxx | 298 ++++----- mysqlc/source/mysqlc_driver.cxx | 16 +- mysqlc/source/mysqlc_driver.hxx | 16 +- mysqlc/source/mysqlc_preparedstatement.cxx | 82 +-- mysqlc/source/mysqlc_preparedstatement.hxx | 82 +-- mysqlc/source/mysqlc_resultset.cxx | 162 ++--- mysqlc/source/mysqlc_resultset.hxx | 162 ++--- mysqlc/source/mysqlc_resultsetmetadata.cxx | 42 +- mysqlc/source/mysqlc_resultsetmetadata.hxx | 42 +- mysqlc/source/mysqlc_statement.cxx | 44 +- mysqlc/source/mysqlc_statement.hxx | 44 +- oox/source/core/contexthandler.cxx | 14 +- oox/source/core/contexthandler2.cxx | 8 +- oox/source/core/fasttokenhandler.cxx | 14 +- oox/source/core/filterbase.cxx | 16 +- oox/source/core/filterdetect.cxx | 28 +- oox/source/core/fragmenthandler.cxx | 20 +- oox/source/core/fragmenthandler2.cxx | 12 +- oox/source/core/recordparser.cxx | 16 +- oox/source/core/relationshandler.cxx | 2 +- oox/source/crypto/DocumentDecryption.cxx | 28 +- oox/source/docprop/docprophandler.cxx | 20 +- oox/source/docprop/docprophandler.hxx | 20 +- oox/source/docprop/ooxmldocpropimport.cxx | 8 +- oox/source/docprop/ooxmldocpropimport.hxx | 8 +- .../drawingml/diagram/diagramfragmenthandler.cxx | 4 +- .../drawingml/diagram/diagramfragmenthandler.hxx | 4 +- oox/source/export/ColorPropertySet.cxx | 34 +- oox/source/export/ColorPropertySet.hxx | 22 +- oox/source/helper/propertymap.cxx | 40 +- oox/source/helper/textinputstream.cxx | 20 +- oox/source/ole/olestorage.cxx | 24 +- oox/source/ole/vbamodule.cxx | 14 +- oox/source/ppt/pptimport.cxx | 2 +- oox/source/shape/ShapeContextHandler.cxx | 46 +- oox/source/shape/ShapeContextHandler.hxx | 46 +- oox/source/shape/ShapeDrawingFragmentHandler.cxx | 2 +- oox/source/shape/ShapeDrawingFragmentHandler.hxx | 2 +- oox/source/vml/vmlinputstream.cxx | 10 +- package/inc/ZipPackage.hxx | 38 +- package/inc/ZipPackageBuffer.hxx | 22 +- package/inc/ZipPackageEntry.hxx | 24 +- package/inc/ZipPackageFolder.hxx | 30 +- package/inc/ZipPackageStream.hxx | 26 +- package/inc/zipfileaccess.hxx | 26 +- package/source/manifest/ManifestImport.cxx | 16 +- package/source/manifest/ManifestImport.hxx | 16 +- package/source/manifest/ManifestReader.cxx | 8 +- package/source/manifest/ManifestReader.hxx | 8 +- package/source/manifest/ManifestWriter.cxx | 8 +- package/source/manifest/ManifestWriter.hxx | 8 +- package/source/xstor/disposelistener.cxx | 2 +- package/source/xstor/disposelistener.hxx | 2 +- package/source/xstor/ocompinstream.cxx | 56 +- package/source/xstor/ocompinstream.hxx | 56 +- package/source/xstor/ohierarchyholder.cxx | 10 +- package/source/xstor/ohierarchyholder.hxx | 10 +- package/source/xstor/oseekinstream.cxx | 10 +- package/source/xstor/oseekinstream.hxx | 10 +- package/source/xstor/owriteablestream.cxx | 90 +-- package/source/xstor/owriteablestream.hxx | 90 +-- package/source/xstor/selfterminatefilestream.cxx | 16 +- package/source/xstor/selfterminatefilestream.hxx | 16 +- package/source/xstor/switchpersistencestream.cxx | 30 +- package/source/xstor/switchpersistencestream.hxx | 30 +- package/source/xstor/xfactory.cxx | 10 +- package/source/xstor/xfactory.hxx | 10 +- package/source/xstor/xstorage.cxx | 144 ++-- package/source/xstor/xstorage.hxx | 144 ++-- package/source/zipapi/XUnbufferedStream.cxx | 10 +- package/source/zipapi/XUnbufferedStream.hxx | 10 +- package/source/zipapi/blowfishcontext.cxx | 4 +- package/source/zipapi/blowfishcontext.hxx | 4 +- package/source/zipapi/sha1context.cxx | 4 +- package/source/zipapi/sha1context.hxx | 4 +- package/source/zippackage/ZipPackage.cxx | 52 +- package/source/zippackage/ZipPackageBuffer.cxx | 22 +- package/source/zippackage/ZipPackageEntry.cxx | 18 +- package/source/zippackage/ZipPackageFolder.cxx | 30 +- .../zippackage/ZipPackageFolderEnumeration.cxx | 10 +- .../zippackage/ZipPackageFolderEnumeration.hxx | 10 +- package/source/zippackage/ZipPackageSink.cxx | 4 +- package/source/zippackage/ZipPackageSink.hxx | 4 +- package/source/zippackage/ZipPackageStream.cxx | 26 +- package/source/zippackage/wrapstreamforshare.cxx | 16 +- package/source/zippackage/wrapstreamforshare.hxx | 16 +- package/source/zippackage/zipfileaccess.cxx | 26 +- padmin/source/desktopcontext.cxx | 2 +- padmin/source/desktopcontext.hxx | 2 +- pyuno/source/module/pyuno_adapter.cxx | 14 +- pyuno/source/module/pyuno_impl.hxx | 14 +- .../source/unourl_resolver/unourl_resolver.cxx | 16 +- reportdesign/inc/PropertyForward.hxx | 4 +- reportdesign/inc/ReportDefinition.hxx | 236 +++---- reportdesign/inc/ReportHelperDefines.hxx | 308 ++++----- reportdesign/inc/UndoEnv.hxx | 12 +- reportdesign/source/core/api/FixedLine.cxx | 128 ++-- reportdesign/source/core/api/FixedText.cxx | 76 +-- reportdesign/source/core/api/FormatCondition.cxx | 30 +- reportdesign/source/core/api/FormattedField.cxx | 84 +-- reportdesign/source/core/api/Function.cxx | 46 +- reportdesign/source/core/api/Functions.cxx | 26 +- reportdesign/source/core/api/Group.cxx | 70 +- reportdesign/source/core/api/Groups.cxx | 28 +- reportdesign/source/core/api/ImageControl.cxx | 106 +-- reportdesign/source/core/api/ReportDefinition.cxx | 328 ++++----- reportdesign/source/core/api/ReportEngineJFree.cxx | 46 +- reportdesign/source/core/api/Section.cxx | 108 +-- reportdesign/source/core/api/Shape.cxx | 104 +-- reportdesign/source/core/inc/FixedLine.hxx | 76 +-- reportdesign/source/core/inc/FixedText.hxx | 56 +- reportdesign/source/core/inc/FormatCondition.hxx | 34 +- reportdesign/source/core/inc/FormattedField.hxx | 64 +- reportdesign/source/core/inc/Function.hxx | 50 +- reportdesign/source/core/inc/Functions.hxx | 30 +- reportdesign/source/core/inc/Group.hxx | 74 +-- reportdesign/source/core/inc/Groups.hxx | 32 +- reportdesign/source/core/inc/ImageControl.hxx | 66 +- reportdesign/source/core/inc/ReportDrawPage.hxx | 4 +- reportdesign/source/core/inc/ReportEngineJFree.hxx | 50 +- reportdesign/source/core/inc/ReportHelperImpl.hxx | 518 +++++++-------- reportdesign/source/core/inc/RptObjectListener.hxx | 4 +- reportdesign/source/core/inc/Section.hxx | 110 +-- reportdesign/source/core/inc/Shape.hxx | 76 +-- reportdesign/source/core/sdr/PropertyForward.cxx | 4 +- reportdesign/source/core/sdr/ReportDrawPage.cxx | 4 +- reportdesign/source/core/sdr/RptObjectListener.cxx | 4 +- reportdesign/source/core/sdr/UndoEnv.cxx | 12 +- reportdesign/source/filter/xml/dbloader2.cxx | 8 +- reportdesign/source/filter/xml/dbloader2.hxx | 8 +- reportdesign/source/filter/xml/xmlExport.cxx | 2 +- reportdesign/source/filter/xml/xmlExport.hxx | 2 +- .../source/filter/xml/xmlExportDocumentHandler.cxx | 28 +- .../source/filter/xml/xmlExportDocumentHandler.hxx | 24 +- .../source/filter/xml/xmlImportDocumentHandler.cxx | 28 +- .../source/filter/xml/xmlImportDocumentHandler.hxx | 24 +- reportdesign/source/filter/xml/xmlfilter.cxx | 6 +- reportdesign/source/filter/xml/xmlfilter.hxx | 6 +- reportdesign/source/ui/dlg/AddField.cxx | 6 +- reportdesign/source/ui/dlg/GroupsSorting.cxx | 16 +- reportdesign/source/ui/dlg/Navigator.cxx | 8 +- reportdesign/source/ui/inc/AddField.hxx | 6 +- reportdesign/source/ui/inc/DataProviderHandler.hxx | 42 +- reportdesign/source/ui/inc/DefaultInspection.hxx | 24 +- reportdesign/source/ui/inc/GeometryHandler.hxx | 46 +- .../source/ui/inc/ReportComponentHandler.hxx | 42 +- reportdesign/source/ui/inc/ReportController.hxx | 54 +- .../source/ui/inc/ReportControllerObserver.hxx | 12 +- reportdesign/source/ui/inc/statusbarcontroller.hxx | 28 +- reportdesign/source/ui/inc/toolboxcontroller.hxx | 24 +- .../source/ui/inspection/DataProviderHandler.cxx | 42 +- .../source/ui/inspection/DefaultInspection.cxx | 24 +- .../source/ui/inspection/GeometryHandler.cxx | 46 +- .../ui/inspection/ReportComponentHandler.cxx | 42 +- .../source/ui/misc/statusbarcontroller.cxx | 28 +- reportdesign/source/ui/misc/toolboxcontroller.cxx | 24 +- reportdesign/source/ui/report/ReportController.cxx | 52 +- .../source/ui/report/ReportControllerObserver.cxx | 12 +- sax/source/expatwrap/attrlistimpl.cxx | 14 +- sax/source/expatwrap/attrlistimpl.hxx | 14 +- sax/source/expatwrap/sax_expat.cxx | 54 +- sax/source/expatwrap/saxwriter.cxx | 68 +- sax/source/fastparser/fastparser.cxx | 36 +- sax/source/tools/fastattribs.cxx | 14 +- sc/inc/AccessibleFilterMenu.hxx | 46 +- sc/inc/AccessibleFilterMenuItem.hxx | 22 +- sc/inc/AccessibleFilterTopWindow.hxx | 6 +- sc/inc/AccessibleGlobal.hxx | 8 +- sc/inc/ScPanelFactory.hxx | 2 +- sc/inc/addruno.hxx | 20 +- sc/inc/afmtuno.hxx | 80 +-- sc/inc/appluno.hxx | 124 ++-- sc/inc/cellsuno.hxx | 506 +++++++------- sc/inc/chart2uno.hxx | 80 +-- sc/inc/chartuno.hxx | 44 +- sc/inc/confuno.hxx | 20 +- sc/inc/cursuno.hxx | 42 +- sc/inc/dapiuno.hxx | 264 ++++---- sc/inc/datauno.hxx | 188 +++--- sc/inc/defltuno.hxx | 28 +- sc/inc/dispuno.hxx | 20 +- sc/inc/docuno.hxx | 284 ++++---- sc/inc/dptabsrc.hxx | 190 +++--- sc/inc/eventuno.hxx | 18 +- sc/inc/fielduno.hxx | 88 +-- sc/inc/filtuno.hxx | 18 +- sc/inc/fmtuno.hxx | 108 +-- sc/inc/funcuno.hxx | 20 +- sc/inc/linkuno.hxx | 188 +++--- sc/inc/miscuno.hxx | 38 +- sc/inc/nameuno.hxx | 118 ++-- sc/inc/notesuno.hxx | 32 +- sc/inc/optuno.hxx | 2 +- sc/inc/pageuno.hxx | 8 +- sc/inc/shapeuno.hxx | 64 +- sc/inc/srchuno.hxx | 30 +- sc/inc/styleuno.hxx | 108 +-- sc/inc/targuno.hxx | 54 +- sc/inc/textuno.hxx | 78 +-- sc/inc/tokenuno.hxx | 22 +- sc/inc/viewuno.hxx | 86 +-- sc/source/core/data/dptabsrc.cxx | 104 +-- sc/source/core/inc/addinlis.hxx | 10 +- sc/source/core/tool/addinlis.cxx | 4 +- sc/source/filter/excel/excimp8.cxx | 16 +- sc/source/filter/excel/xistyle.cxx | 8 +- sc/source/filter/inc/excelfilter.hxx | 2 +- sc/source/filter/inc/ooxformulaparser.hxx | 14 +- sc/source/filter/oox/excelfilter.cxx | 2 +- sc/source/filter/oox/ooxformulaparser.cxx | 14 +- sc/source/filter/xml/XMLCodeNameProvider.cxx | 10 +- sc/source/filter/xml/XMLCodeNameProvider.hxx | 10 +- sc/source/filter/xml/xmlexprt.cxx | 10 +- sc/source/filter/xml/xmlexprt.hxx | 10 +- sc/source/filter/xml/xmlimprt.cxx | 4 +- sc/source/filter/xml/xmlimprt.hxx | 4 +- sc/source/ui/Accessibility/AccessibleCell.cxx | 18 +- sc/source/ui/Accessibility/AccessibleCellBase.cxx | 22 +- .../ui/Accessibility/AccessibleContextBase.cxx | 52 +- .../ui/Accessibility/AccessibleCsvControl.cxx | 166 ++--- .../Accessibility/AccessibleDataPilotControl.cxx | 106 +-- sc/source/ui/Accessibility/AccessibleDocument.cxx | 54 +- .../AccessibleDocumentPagePreview.cxx | 18 +- .../ui/Accessibility/AccessibleEditObject.cxx | 44 +- .../ui/Accessibility/AccessibleFilterMenu.cxx | 46 +- .../ui/Accessibility/AccessibleFilterMenuItem.cxx | 22 +- .../ui/Accessibility/AccessibleFilterTopWindow.cxx | 6 +- sc/source/ui/Accessibility/AccessibleGlobal.cxx | 8 +- .../ui/Accessibility/AccessiblePageHeader.cxx | 22 +- .../ui/Accessibility/AccessiblePageHeaderArea.cxx | 20 +- .../ui/Accessibility/AccessiblePreviewCell.cxx | 16 +- .../Accessibility/AccessiblePreviewHeaderCell.cxx | 32 +- .../ui/Accessibility/AccessiblePreviewTable.cxx | 30 +- .../ui/Accessibility/AccessibleSpreadsheet.cxx | 44 +- sc/source/ui/Accessibility/AccessibleTableBase.cxx | 30 +- .../ui/Accessibility/DrawModelBroadcaster.cxx | 4 +- 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 | 18 +- sc/source/ui/inc/AccessibleCellBase.hxx | 22 +- sc/source/ui/inc/AccessibleContextBase.hxx | 52 +- sc/source/ui/inc/AccessibleCsvControl.hxx | 166 ++--- sc/source/ui/inc/AccessibleDataPilotControl.hxx | 26 +- sc/source/ui/inc/AccessibleDocument.hxx | 54 +- sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 18 +- sc/source/ui/inc/AccessibleEditObject.hxx | 44 +- sc/source/ui/inc/AccessiblePageHeader.hxx | 22 +- sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 20 +- sc/source/ui/inc/AccessiblePreviewCell.hxx | 16 +- sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 32 +- sc/source/ui/inc/AccessiblePreviewTable.hxx | 30 +- sc/source/ui/inc/AccessibleSpreadsheet.hxx | 44 +- sc/source/ui/inc/AccessibleTableBase.hxx | 30 +- sc/source/ui/inc/ChartRangeSelectionListener.hxx | 10 +- sc/source/ui/inc/DrawModelBroadcaster.hxx | 4 +- sc/source/ui/inc/drwtrans.hxx | 2 +- sc/source/ui/inc/transobj.hxx | 2 +- sc/source/ui/sidebar/ScPanelFactory.cxx | 2 +- .../ui/unoobj/ChartRangeSelectionListener.cxx | 4 +- sc/source/ui/unoobj/addruno.cxx | 12 +- sc/source/ui/unoobj/afmtuno.cxx | 46 +- sc/source/ui/unoobj/appluno.cxx | 26 +- sc/source/ui/unoobj/celllistsource.cxx | 24 +- sc/source/ui/unoobj/celllistsource.hxx | 24 +- sc/source/ui/unoobj/cellsuno.cxx | 452 ++++++------- sc/source/ui/unoobj/cellvaluebinding.cxx | 26 +- sc/source/ui/unoobj/cellvaluebinding.hxx | 26 +- sc/source/ui/unoobj/chart2uno.cxx | 62 +- sc/source/ui/unoobj/chartuno.cxx | 32 +- sc/source/ui/unoobj/confuno.cxx | 12 +- sc/source/ui/unoobj/cursuno.cxx | 42 +- sc/source/ui/unoobj/dapiuno.cxx | 196 +++--- sc/source/ui/unoobj/datauno.cxx | 134 ++-- sc/source/ui/unoobj/defltuno.cxx | 14 +- sc/source/ui/unoobj/dispuno.cxx | 20 +- sc/source/ui/unoobj/docuno.cxx | 210 +++--- sc/source/ui/unoobj/eventuno.cxx | 12 +- sc/source/ui/unoobj/exceldetect.cxx | 8 +- sc/source/ui/unoobj/exceldetect.hxx | 8 +- sc/source/ui/unoobj/fielduno.cxx | 68 +- sc/source/ui/unoobj/filtuno.cxx | 12 +- sc/source/ui/unoobj/fmtuno.cxx | 82 +-- sc/source/ui/unoobj/funcuno.cxx | 12 +- sc/source/ui/unoobj/linkuno.cxx | 136 ++-- sc/source/ui/unoobj/miscuno.cxx | 18 +- sc/source/ui/unoobj/nameuno.cxx | 84 +-- sc/source/ui/unoobj/notesuno.cxx | 26 +- sc/source/ui/unoobj/optuno.cxx | 2 +- sc/source/ui/unoobj/pageuno.cxx | 8 +- sc/source/ui/unoobj/scdetect.cxx | 8 +- sc/source/ui/unoobj/scdetect.hxx | 8 +- sc/source/ui/unoobj/servuno.cxx | 14 +- sc/source/ui/unoobj/shapeuno.cxx | 72 +- sc/source/ui/unoobj/srchuno.cxx | 22 +- sc/source/ui/unoobj/styleuno.cxx | 88 +-- sc/source/ui/unoobj/targuno.cxx | 28 +- sc/source/ui/unoobj/textuno.cxx | 66 +- sc/source/ui/unoobj/tokenuno.cxx | 8 +- sc/source/ui/unoobj/viewuno.cxx | 80 +-- sc/source/ui/vba/vbaapplication.cxx | 132 ++-- sc/source/ui/vba/vbaapplication.hxx | 140 ++-- sc/source/ui/vba/vbaassistant.cxx | 22 +- sc/source/ui/vba/vbaassistant.hxx | 22 +- sc/source/ui/vba/vbaaxes.cxx | 12 +- sc/source/ui/vba/vbaaxis.cxx | 82 +-- sc/source/ui/vba/vbaaxis.hxx | 82 +-- sc/source/ui/vba/vbaborders.cxx | 44 +- sc/source/ui/vba/vbaborders.hxx | 16 +- sc/source/ui/vba/vbacharacters.cxx | 18 +- sc/source/ui/vba/vbacharacters.hxx | 18 +- sc/source/ui/vba/vbachart.cxx | 34 +- sc/source/ui/vba/vbachart.hxx | 34 +- sc/source/ui/vba/vbachartobject.cxx | 8 +- sc/source/ui/vba/vbachartobject.hxx | 8 +- sc/source/ui/vba/vbachartobjects.cxx | 6 +- sc/source/ui/vba/vbachartobjects.hxx | 4 +- sc/source/ui/vba/vbacomment.cxx | 18 +- sc/source/ui/vba/vbacomment.hxx | 18 +- sc/source/ui/vba/vbacomments.cxx | 2 +- sc/source/ui/vba/vbadialogs.cxx | 2 +- sc/source/ui/vba/vbadialogs.hxx | 2 +- sc/source/ui/vba/vbaeventshelper.cxx | 58 +- sc/source/ui/vba/vbaeventshelper.hxx | 2 +- sc/source/ui/vba/vbafont.cxx | 46 +- sc/source/ui/vba/vbafont.hxx | 46 +- sc/source/ui/vba/vbaformatcondition.cxx | 12 +- sc/source/ui/vba/vbaformatcondition.hxx | 12 +- sc/source/ui/vba/vbaformatconditions.cxx | 8 +- sc/source/ui/vba/vbaformatconditions.hxx | 4 +- sc/source/ui/vba/vbaglobals.cxx | 52 +- sc/source/ui/vba/vbaglobals.hxx | 52 +- sc/source/ui/vba/vbahyperlink.cxx | 26 +- sc/source/ui/vba/vbahyperlink.hxx | 26 +- sc/source/ui/vba/vbahyperlinks.cxx | 20 +- sc/source/ui/vba/vbahyperlinks.hxx | 4 +- sc/source/ui/vba/vbainterior.cxx | 20 +- sc/source/ui/vba/vbainterior.hxx | 20 +- sc/source/ui/vba/vbamenu.cxx | 8 +- sc/source/ui/vba/vbamenu.hxx | 8 +- sc/source/ui/vba/vbamenubar.cxx | 2 +- sc/source/ui/vba/vbamenubar.hxx | 2 +- sc/source/ui/vba/vbamenubars.cxx | 4 +- sc/source/ui/vba/vbamenuitem.cxx | 10 +- sc/source/ui/vba/vbamenuitem.hxx | 10 +- sc/source/ui/vba/vbamenuitems.cxx | 6 +- sc/source/ui/vba/vbamenuitems.hxx | 2 +- sc/source/ui/vba/vbamenus.cxx | 6 +- sc/source/ui/vba/vbamenus.hxx | 2 +- sc/source/ui/vba/vbaname.cxx | 36 +- sc/source/ui/vba/vbaname.hxx | 36 +- sc/source/ui/vba/vbanames.cxx | 2 +- sc/source/ui/vba/vbaoleobject.cxx | 30 +- sc/source/ui/vba/vbaoleobject.hxx | 30 +- sc/source/ui/vba/vbaoleobjects.cxx | 12 +- sc/source/ui/vba/vbaoutline.cxx | 2 +- sc/source/ui/vba/vbaoutline.hxx | 2 +- sc/source/ui/vba/vbapagebreaks.cxx | 20 +- sc/source/ui/vba/vbapagebreaks.hxx | 4 +- sc/source/ui/vba/vbapagesetup.cxx | 76 +-- sc/source/ui/vba/vbapagesetup.hxx | 76 +-- sc/source/ui/vba/vbapalette.cxx | 8 +- sc/source/ui/vba/vbapane.cxx | 14 +- sc/source/ui/vba/vbapane.hxx | 14 +- 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 | 2 +- sc/source/ui/vba/vbarange.cxx | 206 +++--- sc/source/ui/vba/vbarange.hxx | 188 +++--- sc/source/ui/vba/vbasheetobject.cxx | 84 +-- sc/source/ui/vba/vbasheetobject.hxx | 84 +-- sc/source/ui/vba/vbasheetobjects.cxx | 18 +- sc/source/ui/vba/vbasheetobjects.hxx | 2 +- sc/source/ui/vba/vbastyle.cxx | 12 +- sc/source/ui/vba/vbastyle.hxx | 12 +- sc/source/ui/vba/vbastyles.cxx | 6 +- sc/source/ui/vba/vbastyles.hxx | 2 +- sc/source/ui/vba/vbatextboxshape.cxx | 6 +- sc/source/ui/vba/vbatextboxshape.hxx | 6 +- sc/source/ui/vba/vbatextframe.cxx | 2 +- sc/source/ui/vba/vbatextframe.hxx | 2 +- sc/source/ui/vba/vbavalidation.cxx | 42 +- sc/source/ui/vba/vbavalidation.hxx | 42 +- sc/source/ui/vba/vbawindow.cxx | 126 ++-- sc/source/ui/vba/vbawindow.hxx | 106 +-- sc/source/ui/vba/vbawindows.cxx | 24 +- sc/source/ui/vba/vbawindows.hxx | 2 +- sc/source/ui/vba/vbaworkbook.cxx | 34 +- sc/source/ui/vba/vbaworkbook.hxx | 34 +- sc/source/ui/vba/vbaworkbooks.cxx | 8 +- sc/source/ui/vba/vbaworkbooks.hxx | 6 +- sc/source/ui/vba/vbaworksheet.cxx | 130 ++-- sc/source/ui/vba/vbaworksheet.hxx | 140 ++-- sc/source/ui/vba/vbaworksheets.cxx | 38 +- sc/source/ui/vba/vbaworksheets.hxx | 16 +- sc/source/ui/vba/vbawsfunction.cxx | 14 +- sc/source/ui/vba/vbawsfunction.hxx | 14 +- scaddins/source/analysis/analysis.cxx | 156 ++--- scaddins/source/analysis/analysis.hxx | 266 ++++---- scaddins/source/analysis/financial.cxx | 74 +-- scaddins/source/datefunc/datefunc.cxx | 44 +- scaddins/source/datefunc/datefunc.hxx | 44 +- scaddins/source/pricing/pricing.cxx | 36 +- scaddins/source/pricing/pricing.hxx | 36 +- sccomp/source/solver/solver.cxx | 42 +- sccomp/source/solver/solver.hxx | 42 +- scripting/source/basprov/baslibnode.cxx | 8 +- scripting/source/basprov/baslibnode.hxx | 8 +- scripting/source/basprov/basmethnode.cxx | 22 +- scripting/source/basprov/basmethnode.hxx | 22 +- scripting/source/basprov/basmodnode.cxx | 8 +- scripting/source/basprov/basmodnode.hxx | 8 +- scripting/source/basprov/basprov.cxx | 18 +- scripting/source/basprov/basprov.hxx | 18 +- scripting/source/basprov/basscript.cxx | 4 +- scripting/source/basprov/basscript.hxx | 4 +- scripting/source/dlgprov/DialogModelProvider.cxx | 38 +- scripting/source/dlgprov/DialogModelProvider.hxx | 38 +- scripting/source/dlgprov/dlgevtatt.cxx | 14 +- scripting/source/dlgprov/dlgevtatt.hxx | 14 +- scripting/source/dlgprov/dlgprov.cxx | 16 +- scripting/source/dlgprov/dlgprov.hxx | 16 +- scripting/source/protocolhandler/scripthandler.cxx | 20 +- scripting/source/protocolhandler/scripthandler.hxx | 20 +- scripting/source/provider/ActiveMSPList.cxx | 2 +- scripting/source/provider/ActiveMSPList.hxx | 2 +- .../source/provider/BrowseNodeFactoryImpl.cxx | 54 +- .../source/provider/BrowseNodeFactoryImpl.hxx | 8 +- scripting/source/provider/MasterScriptProvider.cxx | 34 +- scripting/source/provider/MasterScriptProvider.hxx | 34 +- .../provider/MasterScriptProviderFactory.cxx | 8 +- .../provider/MasterScriptProviderFactory.hxx | 8 +- scripting/source/provider/ScriptingContext.hxx | 2 +- scripting/source/provider/URIHelper.cxx | 14 +- scripting/source/provider/URIHelper.hxx | 14 +- scripting/source/stringresource/stringresource.cxx | 246 +++---- scripting/source/stringresource/stringresource.hxx | 246 +++---- scripting/source/vbaevents/eventhelper.cxx | 62 +- sd/inc/stlfamily.hxx | 54 +- sd/inc/stlpool.hxx | 26 +- sd/inc/stlsheet.hxx | 50 +- sd/source/core/CustomAnimationEffect.cxx | 8 +- sd/source/core/annotations/Annotation.cxx | 72 +- .../core/annotations/AnnotationEnumeration.cxx | 8 +- sd/source/core/stlfamily.cxx | 54 +- sd/source/core/stlpool.cxx | 26 +- sd/source/core/stlsheet.cxx | 50 +- sd/source/filter/grf/sdgrffilter.cxx | 4 +- sd/source/filter/html/HtmlOptionsDialog.cxx | 36 +- .../accessibility/AccessibleDocumentViewBase.cxx | 46 +- .../accessibility/AccessibleDrawDocumentView.cxx | 20 +- .../ui/accessibility/AccessibleOutlineView.cxx | 16 +- sd/source/ui/accessibility/AccessiblePageShape.cxx | 18 +- .../AccessiblePresentationGraphicShape.cxx | 4 +- .../AccessiblePresentationOLEShape.cxx | 4 +- .../accessibility/AccessiblePresentationShape.cxx | 2 +- .../accessibility/AccessibleSlideSorterObject.cxx | 50 +- .../ui/accessibility/AccessibleSlideSorterView.cxx | 64 +- 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/slidelayoutcontroller.cxx | 4 +- sd/source/ui/controller/slidelayoutcontroller.hxx | 4 +- sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2 +- sd/source/ui/dlg/RemoteDialogClientBox.hxx | 2 +- sd/source/ui/dlg/sdtreelb.cxx | 2 +- .../ui/framework/configuration/Configuration.cxx | 14 +- .../configuration/ConfigurationController.cxx | 34 +- .../GenericConfigurationChangeRequest.cxx | 6 +- .../GenericConfigurationChangeRequest.hxx | 6 +- .../ui/framework/configuration/ResourceId.cxx | 22 +- .../ui/framework/configuration/UpdateRequest.cxx | 6 +- .../ui/framework/configuration/UpdateRequest.hxx | 6 +- .../ui/framework/factories/BasicPaneFactory.cxx | 10 +- .../ui/framework/factories/BasicPaneFactory.hxx | 10 +- .../ui/framework/factories/BasicToolBarFactory.cxx | 8 +- .../ui/framework/factories/BasicToolBarFactory.hxx | 8 +- .../ui/framework/factories/BasicViewFactory.cxx | 6 +- .../ui/framework/factories/BasicViewFactory.hxx | 6 +- .../ui/framework/factories/ChildWindowPane.cxx | 4 +- .../ui/framework/factories/ChildWindowPane.hxx | 4 +- .../ui/framework/factories/FrameWindowPane.cxx | 2 +- .../ui/framework/factories/FrameWindowPane.hxx | 2 +- .../ui/framework/factories/FullScreenPane.cxx | 8 +- .../ui/framework/factories/FullScreenPane.hxx | 8 +- sd/source/ui/framework/factories/Pane.cxx | 18 +- .../ui/framework/factories/PresentationFactory.cxx | 16 +- .../ui/framework/factories/ViewShellWrapper.cxx | 26 +- .../ui/framework/module/CenterViewFocusModule.cxx | 4 +- .../ui/framework/module/CenterViewFocusModule.hxx | 4 +- sd/source/ui/framework/module/ModuleController.cxx | 4 +- sd/source/ui/framework/module/ResourceManager.cxx | 4 +- sd/source/ui/framework/module/ResourceManager.hxx | 4 +- sd/source/ui/framework/module/ShellStackGuard.cxx | 4 +- sd/source/ui/framework/module/ShellStackGuard.hxx | 4 +- .../ui/framework/module/SlideSorterModule.cxx | 2 +- .../ui/framework/module/SlideSorterModule.hxx | 2 +- sd/source/ui/framework/module/ToolBarModule.cxx | 4 +- sd/source/ui/framework/module/ToolBarModule.hxx | 4 +- sd/source/ui/framework/module/ToolPanelModule.cxx | 2 +- sd/source/ui/framework/module/ToolPanelModule.hxx | 2 +- sd/source/ui/framework/module/ViewTabBarModule.cxx | 4 +- sd/source/ui/framework/module/ViewTabBarModule.hxx | 4 +- sd/source/ui/framework/tools/FrameworkHelper.cxx | 16 +- sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 46 +- sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 20 +- sd/source/ui/inc/AccessibleOutlineView.hxx | 16 +- sd/source/ui/inc/AccessiblePageShape.hxx | 18 +- .../ui/inc/AccessiblePresentationGraphicShape.hxx | 4 +- .../ui/inc/AccessiblePresentationOLEShape.hxx | 4 +- sd/source/ui/inc/AccessiblePresentationShape.hxx | 2 +- sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 56 +- sd/source/ui/inc/AccessibleSlideSorterView.hxx | 70 +- sd/source/ui/inc/DocumentRenderer.hxx | 6 +- sd/source/ui/inc/DrawController.hxx | 48 +- sd/source/ui/inc/DrawSubController.hxx | 6 +- sd/source/ui/inc/SdUnoDrawView.hxx | 16 +- sd/source/ui/inc/SdUnoOutlineView.hxx | 22 +- sd/source/ui/inc/SdUnoSlideView.hxx | 22 +- sd/source/ui/inc/ViewTabBar.hxx | 20 +- sd/source/ui/inc/framework/Configuration.hxx | 14 +- .../ui/inc/framework/ConfigurationController.hxx | 34 +- sd/source/ui/inc/framework/ModuleController.hxx | 4 +- sd/source/ui/inc/framework/Pane.hxx | 18 +- sd/source/ui/inc/framework/PresentationFactory.hxx | 8 +- sd/source/ui/inc/framework/ResourceId.hxx | 22 +- sd/source/ui/inc/framework/ViewShellWrapper.hxx | 26 +- sd/source/ui/inc/sdtreelb.hxx | 2 +- sd/source/ui/inc/sdxfer.hxx | 2 +- sd/source/ui/inc/slideshow.hxx | 28 +- sd/source/ui/inc/tools/PropertySet.hxx | 14 +- sd/source/ui/inc/tools/SlotStateListener.hxx | 4 +- sd/source/ui/inc/unomodel.hxx | 144 ++-- sd/source/ui/inc/unosrch.hxx | 42 +- sd/source/ui/presenter/PresenterCanvas.cxx | 98 +-- sd/source/ui/presenter/PresenterCanvas.hxx | 66 +- sd/source/ui/presenter/PresenterHelper.cxx | 18 +- sd/source/ui/presenter/PresenterHelper.hxx | 18 +- sd/source/ui/presenter/PresenterPreviewCache.cxx | 18 +- sd/source/ui/presenter/PresenterPreviewCache.hxx | 18 +- sd/source/ui/presenter/PresenterTextView.cxx | 2 +- sd/source/ui/presenter/PresenterTextView.hxx | 2 +- sd/source/ui/presenter/SlideRenderer.cxx | 8 +- sd/source/ui/presenter/SlideRenderer.hxx | 8 +- sd/source/ui/remotecontrol/Listener.cxx | 22 +- sd/source/ui/remotecontrol/Listener.hxx | 22 +- sd/source/ui/sidebar/PanelFactory.cxx | 2 +- sd/source/ui/sidebar/PanelFactory.hxx | 2 +- sd/source/ui/slideshow/slideshow.cxx | 28 +- sd/source/ui/slideshow/slideshowimpl.cxx | 108 +-- sd/source/ui/slideshow/slideshowimpl.hxx | 108 +-- sd/source/ui/slideshow/slideshowviewimpl.cxx | 52 +- sd/source/ui/slideshow/slideshowviewimpl.hxx | 52 +- .../ui/slidesorter/controller/SlsListener.cxx | 10 +- .../ui/slidesorter/controller/SlsListener.hxx | 10 +- .../ui/slidesorter/shell/SlideSorterService.cxx | 72 +- .../ui/slidesorter/shell/SlideSorterService.hxx | 72 +- sd/source/ui/tools/EventMultiplexer.cxx | 20 +- sd/source/ui/tools/PropertySet.cxx | 14 +- sd/source/ui/tools/SlotStateListener.cxx | 4 +- sd/source/ui/unoidl/DrawController.cxx | 50 +- sd/source/ui/unoidl/SdUnoDrawView.cxx | 16 +- sd/source/ui/unoidl/SdUnoOutlineView.cxx | 22 +- sd/source/ui/unoidl/SdUnoSlideView.cxx | 22 +- sd/source/ui/unoidl/UnoDocumentSettings.cxx | 64 +- sd/source/ui/unoidl/randomnode.cxx | 176 ++--- sd/source/ui/unoidl/sddetect.cxx | 8 +- sd/source/ui/unoidl/sddetect.hxx | 2 +- sd/source/ui/unoidl/unocpres.cxx | 56 +- sd/source/ui/unoidl/unocpres.hxx | 56 +- sd/source/ui/unoidl/unolayer.cxx | 64 +- sd/source/ui/unoidl/unolayer.hxx | 64 +- sd/source/ui/unoidl/unomodel.cxx | 146 ++-- sd/source/ui/unoidl/unomodule.cxx | 14 +- sd/source/ui/unoidl/unomodule.hxx | 14 +- sd/source/ui/unoidl/unoobj.cxx | 40 +- sd/source/ui/unoidl/unoobj.hxx | 4 +- sd/source/ui/unoidl/unopage.cxx | 138 ++-- sd/source/ui/unoidl/unopage.hxx | 122 ++-- sd/source/ui/unoidl/unopback.cxx | 28 +- sd/source/ui/unoidl/unopback.hxx | 28 +- sd/source/ui/unoidl/unosrch.cxx | 42 +- sd/source/ui/view/DocumentRenderer.cxx | 6 +- sd/source/ui/view/ViewTabBar.cxx | 20 +- sd/source/ui/view/drviewsa.cxx | 4 +- sdext/source/minimizer/informationdialog.cxx | 4 +- sdext/source/minimizer/informationdialog.hxx | 4 +- sdext/source/minimizer/optimizerdialog.cxx | 36 +- sdext/source/minimizer/optimizerdialog.hxx | 36 +- sdext/source/minimizer/pppoptimizer.cxx | 10 +- sdext/source/minimizer/pppoptimizer.hxx | 10 +- sdext/source/minimizer/pppoptimizerdialog.cxx | 18 +- sdext/source/minimizer/pppoptimizerdialog.hxx | 18 +- sdext/source/pdfimport/filterdet.cxx | 2 +- sdext/source/pdfimport/filterdet.hxx | 2 +- sdext/source/pdfimport/misc/pwdinteract.cxx | 24 +- sdext/source/pdfimport/pdfiadaptor.cxx | 10 +- sdext/source/pdfimport/pdfiadaptor.hxx | 10 +- sdext/source/pdfimport/sax/saxattrlist.cxx | 14 +- sdext/source/pdfimport/sax/saxattrlist.hxx | 14 +- sdext/source/pdfimport/test/outputwrap.hxx | 6 +- sdext/source/presenter/PresenterAccessibility.cxx | 228 +++---- sdext/source/presenter/PresenterAccessibility.hxx | 10 +- sdext/source/presenter/PresenterButton.cxx | 24 +- sdext/source/presenter/PresenterButton.hxx | 24 +- sdext/source/presenter/PresenterController.cxx | 26 +- sdext/source/presenter/PresenterController.hxx | 26 +- .../presenter/PresenterCurrentSlideObserver.cxx | 22 +- .../presenter/PresenterCurrentSlideObserver.hxx | 22 +- .../presenter/PresenterFrameworkObserver.cxx | 4 +- .../presenter/PresenterFrameworkObserver.hxx | 4 +- sdext/source/presenter/PresenterHelpView.cxx | 16 +- sdext/source/presenter/PresenterHelpView.hxx | 16 +- sdext/source/presenter/PresenterNotesView.cxx | 24 +- sdext/source/presenter/PresenterNotesView.hxx | 24 +- sdext/source/presenter/PresenterPane.cxx | 14 +- sdext/source/presenter/PresenterPane.hxx | 14 +- sdext/source/presenter/PresenterPaneBase.cxx | 16 +- sdext/source/presenter/PresenterPaneBase.hxx | 16 +- .../presenter/PresenterPaneBorderPainter.cxx | 10 +- .../presenter/PresenterPaneBorderPainter.hxx | 10 +- sdext/source/presenter/PresenterPaneContainer.cxx | 2 +- sdext/source/presenter/PresenterPaneContainer.hxx | 2 +- sdext/source/presenter/PresenterPaneFactory.cxx | 4 +- sdext/source/presenter/PresenterPaneFactory.hxx | 4 +- .../source/presenter/PresenterProtocolHandler.cxx | 26 +- .../source/presenter/PresenterProtocolHandler.hxx | 6 +- sdext/source/presenter/PresenterScreen.cxx | 12 +- sdext/source/presenter/PresenterScreen.hxx | 4 +- sdext/source/presenter/PresenterScrollBar.cxx | 22 +- sdext/source/presenter/PresenterScrollBar.hxx | 22 +- sdext/source/presenter/PresenterSlidePreview.cxx | 20 +- sdext/source/presenter/PresenterSlidePreview.hxx | 20 +- sdext/source/presenter/PresenterSlideShowView.cxx | 60 +- sdext/source/presenter/PresenterSlideShowView.hxx | 60 +- sdext/source/presenter/PresenterSlideSorter.cxx | 36 +- sdext/source/presenter/PresenterSlideSorter.hxx | 36 +- sdext/source/presenter/PresenterSpritePane.cxx | 14 +- sdext/source/presenter/PresenterSpritePane.hxx | 14 +- sdext/source/presenter/PresenterTimer.cxx | 2 +- sdext/source/presenter/PresenterTimer.hxx | 2 +- sdext/source/presenter/PresenterToolBar.cxx | 56 +- sdext/source/presenter/PresenterToolBar.hxx | 40 +- sdext/source/presenter/PresenterViewFactory.cxx | 6 +- sdext/source/presenter/PresenterViewFactory.hxx | 4 +- sdext/source/presenter/PresenterWindowManager.cxx | 24 +- sdext/source/presenter/PresenterWindowManager.hxx | 24 +- sfx2/source/appl/appdispatchprovider.cxx | 32 +- sfx2/source/appl/appinit.cxx | 24 +- sfx2/source/appl/appopen.cxx | 8 +- sfx2/source/appl/appuno.cxx | 24 +- sfx2/source/appl/childwin.cxx | 2 +- sfx2/source/appl/helpdispatch.cxx | 6 +- sfx2/source/appl/helpdispatch.hxx | 6 +- sfx2/source/appl/helpinterceptor.cxx | 28 +- sfx2/source/appl/helpinterceptor.hxx | 28 +- sfx2/source/appl/imestatuswindow.cxx | 8 +- sfx2/source/appl/imestatuswindow.hxx | 4 +- sfx2/source/appl/macroloader.cxx | 20 +- sfx2/source/appl/sfxpicklist.cxx | 2 +- sfx2/source/appl/shutdownicon.cxx | 26 +- sfx2/source/appl/shutdownicon.hxx | 18 +- sfx2/source/appl/workwin.cxx | 10 +- sfx2/source/appl/xpackcreator.cxx | 16 +- sfx2/source/bastyp/fltlst.cxx | 4 +- sfx2/source/control/querystatus.cxx | 8 +- sfx2/source/control/sfxstatuslistener.cxx | 10 +- sfx2/source/control/statcach.cxx | 4 +- sfx2/source/control/thumbnailviewacc.cxx | 106 +-- sfx2/source/control/thumbnailviewacc.hxx | 112 ++-- sfx2/source/control/unoctitm.cxx | 20 +- sfx2/source/dialog/backingcomp.cxx | 100 +-- sfx2/source/dialog/filedlghelper.cxx | 14 +- sfx2/source/dialog/filedlgimpl.hxx | 14 +- sfx2/source/dialog/mailmodel.cxx | 8 +- sfx2/source/doc/DocumentMetadataAccess.cxx | 32 +- sfx2/source/doc/Metadatable.cxx | 12 +- sfx2/source/doc/SfxDocumentMetaData.cxx | 254 +++---- sfx2/source/doc/docfile.cxx | 4 +- sfx2/source/doc/docstoragemodifylistener.cxx | 4 +- sfx2/source/doc/doctemplates.cxx | 54 +- sfx2/source/doc/doctemplateslocal.cxx | 16 +- sfx2/source/doc/doctemplateslocal.hxx | 16 +- sfx2/source/doc/docundomanager.cxx | 44 +- sfx2/source/doc/iframe.cxx | 66 +- sfx2/source/doc/objserv.cxx | 12 +- sfx2/source/doc/objxtor.cxx | 12 +- sfx2/source/doc/ownsubfilterservice.cxx | 20 +- sfx2/source/doc/plugin.cxx | 58 +- sfx2/source/doc/printhelper.cxx | 28 +- sfx2/source/doc/printhelper.hxx | 12 +- sfx2/source/doc/sfxbasemodel.cxx | 276 ++++---- sfx2/source/doc/sfxmodelfactory.cxx | 20 +- sfx2/source/inc/docundomanager.hxx | 44 +- sfx2/source/inc/eventsupplier.hxx | 16 +- sfx2/source/inc/fltoptint.hxx | 8 +- sfx2/source/inc/macroloader.hxx | 20 +- sfx2/source/inc/statcach.hxx | 4 +- sfx2/source/inc/workwin.hxx | 10 +- sfx2/source/notify/eventsupplier.cxx | 16 +- sfx2/source/notify/globalevents.cxx | 74 +-- sfx2/source/sidebar/Accessible.cxx | 2 +- sfx2/source/sidebar/Accessible.hxx | 2 +- sfx2/source/sidebar/CommandInfoProvider.cxx | 2 +- sfx2/source/sidebar/ControllerItem.cxx | 4 +- sfx2/source/sidebar/SidebarController.cxx | 10 +- sfx2/source/sidebar/SidebarController.hxx | 10 +- sfx2/source/sidebar/SidebarPanelBase.cxx | 20 +- sfx2/source/sidebar/Theme.cxx | 20 +- sfx2/source/statbar/stbitem.cxx | 22 +- sfx2/source/toolbox/tbxitem.cxx | 42 +- sfx2/source/view/frmload.cxx | 20 +- sfx2/source/view/ipclient.cxx | 80 +-- sfx2/source/view/sfxbasecontroller.cxx | 108 +-- sfx2/source/view/viewsh.cxx | 8 +- shell/source/backends/desktopbe/desktopbackend.cxx | 24 +- shell/source/backends/gconfbe/gconfbackend.cxx | 24 +- shell/source/backends/kde4be/kde4backend.cxx | 24 +- shell/source/backends/kdebe/kdebackend.cxx | 24 +- shell/source/backends/localebe/localebackend.cxx | 10 +- shell/source/backends/localebe/localebackend.hxx | 20 +- shell/source/cmdmail/cmdmailmsg.cxx | 38 +- shell/source/cmdmail/cmdmailmsg.hxx | 38 +- shell/source/cmdmail/cmdmailsuppl.cxx | 12 +- shell/source/cmdmail/cmdmailsuppl.hxx | 12 +- .../sessioninstall/SyncDbusSessionHelper.cxx | 4 +- .../sessioninstall/SyncDbusSessionHelper.hxx | 24 +- shell/source/unix/exec/shellexec.cxx | 8 +- shell/source/unix/exec/shellexec.hxx | 8 +- .../OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 56 +- slideshow/source/engine/eventmultiplexer.cxx | 28 +- slideshow/source/engine/shapes/gdimtftools.cxx | 2 +- slideshow/source/engine/slideshowimpl.cxx | 68 +- slideshow/source/engine/slideview.cxx | 12 +- smoketest/smoketest.cxx | 8 +- sot/source/sdstor/ucbstorage.cxx | 32 +- sot/source/unoolestorage/xolesimplestorage.cxx | 40 +- sot/source/unoolestorage/xolesimplestorage.hxx | 40 +- starmath/inc/unomodel.hxx | 20 +- starmath/source/accessibility.cxx | 134 ++-- starmath/source/accessibility.hxx | 134 ++-- starmath/source/mathmlexport.cxx | 2 +- starmath/source/mathmlexport.hxx | 2 +- starmath/source/mathmlimport.cxx | 4 +- starmath/source/mathmlimport.hxx | 4 +- starmath/source/smdetect.cxx | 8 +- starmath/source/smdetect.hxx | 2 +- starmath/source/unomodel.cxx | 20 +- stoc/source/corereflection/base.hxx | 108 +-- stoc/source/corereflection/crarray.cxx | 20 +- stoc/source/corereflection/crbase.cxx | 36 +- stoc/source/corereflection/crcomp.cxx | 48 +- stoc/source/corereflection/crefl.cxx | 22 +- stoc/source/corereflection/crenum.cxx | 46 +- stoc/source/corereflection/criface.cxx | 100 +-- stoc/source/defaultregistry/defaultregistry.cxx | 184 +++--- stoc/source/implementationregistration/implreg.cxx | 36 +- stoc/source/inspect/introspection.cxx | 204 +++--- stoc/source/invocation/invocation.cxx | 104 +-- .../source/invocation_adapterfactory/iafactory.cxx | 20 +- stoc/source/javaloader/javaloader.cxx | 20 +- stoc/source/javavm/interact.cxx | 10 +- stoc/source/javavm/interact.hxx | 4 +- stoc/source/javavm/javavm.cxx | 32 +- stoc/source/javavm/javavm.hxx | 28 +- stoc/source/loader/dllcomponentloader.cxx | 24 +- stoc/source/namingservice/namingservice.cxx | 24 +- stoc/source/proxy_factory/proxyfac.cxx | 20 +- stoc/source/security/access_controller.cxx | 48 +- stoc/source/security/file_policy.cxx | 24 +- stoc/source/servicemanager/servicemanager.cxx | 206 +++--- stoc/source/simpleregistry/simpleregistry.cxx | 154 ++--- stoc/source/typeconv/convert.cxx | 20 +- .../uriproc/ExternalUriReferenceTranslator.cxx | 20 +- stoc/source/uriproc/UriReferenceFactory.cxx | 54 +- .../UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 50 +- .../UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 66 +- .../uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 16 +- svgio/inc/svgio/svgreader/svgdocumenthandler.hxx | 16 +- svgio/source/svgreader/svgdocumenthandler.cxx | 16 +- svgio/source/svguno/xsvgparser.cxx | 16 +- svl/qa/unit/test_URIHelper.cxx | 20 +- svl/source/config/itemholder2.cxx | 2 +- svl/source/config/itemholder2.hxx | 2 +- svl/source/fsstor/fsfactory.cxx | 10 +- svl/source/fsstor/fsstorage.cxx | 70 +- svl/source/fsstor/fsstorage.hxx | 70 +- svl/source/fsstor/oinputstreamcontainer.cxx | 30 +- svl/source/fsstor/oinputstreamcontainer.hxx | 30 +- svl/source/fsstor/ostreamcontainer.cxx | 42 +- svl/source/fsstor/ostreamcontainer.hxx | 42 +- svl/source/inc/fsfactory.hxx | 10 +- svl/source/inc/passwordcontainer.hxx | 48 +- svl/source/items/itemprop.cxx | 12 +- svl/source/items/style.cxx | 2 +- svl/source/misc/strmadpt.cxx | 18 +- svl/source/numbers/numfmuno.cxx | 102 +-- svl/source/numbers/numfmuno.hxx | 102 +-- svl/source/numbers/numuno.cxx | 6 +- svl/source/numbers/supservs.cxx | 22 +- svl/source/numbers/supservs.hxx | 24 +- svl/source/passwordcontainer/passwordcontainer.cxx | 48 +- svl/source/uno/pathservice.cxx | 14 +- svtools/source/config/itemholder2.cxx | 2 +- svtools/source/config/itemholder2.hxx | 2 +- svtools/source/control/accessibleruler.cxx | 52 +- svtools/source/control/toolbarmenu.cxx | 8 +- svtools/source/control/toolbarmenuacc.cxx | 102 +-- svtools/source/control/toolbarmenuimp.hxx | 114 ++-- svtools/source/control/valueacc.cxx | 106 +-- svtools/source/control/valueimp.hxx | 112 ++-- svtools/source/control/vclxaccessibleheaderbar.cxx | 10 +- .../source/control/vclxaccessibleheaderbaritem.cxx | 40 +- svtools/source/filter/SvFilterOptionsDialog.cxx | 36 +- svtools/source/graphic/descriptor.cxx | 14 +- svtools/source/graphic/descriptor.hxx | 14 +- svtools/source/graphic/graphic.cxx | 24 +- svtools/source/graphic/graphic.hxx | 24 +- svtools/source/graphic/graphicunofactory.cxx | 18 +- svtools/source/graphic/provider.cxx | 16 +- svtools/source/graphic/renderer.cxx | 16 +- svtools/source/graphic/transformer.cxx | 4 +- svtools/source/graphic/transformer.hxx | 4 +- svtools/source/hatchwindow/documentcloser.cxx | 24 +- svtools/source/hatchwindow/hatchwindow.cxx | 18 +- svtools/source/hatchwindow/hatchwindowfactory.cxx | 16 +- svtools/source/inc/hatchwindow.hxx | 18 +- svtools/source/inc/provider.hxx | 16 +- svtools/source/inc/renderer.hxx | 16 +- svtools/source/inc/unoiface.hxx | 214 +++--- svtools/source/java/javacontext.cxx | 4 +- svtools/source/java/javainteractionhandler.cxx | 4 +- svtools/source/misc/cliplistener.cxx | 4 +- svtools/source/misc/dialogclosedlistener.cxx | 4 +- svtools/source/misc/embedhlp.cxx | 28 +- 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/toolpanel/paneltabbarpeer.cxx | 2 +- svtools/source/toolpanel/paneltabbarpeer.hxx | 2 +- svtools/source/toolpanel/toolpaneldeckpeer.cxx | 2 +- svtools/source/toolpanel/toolpaneldeckpeer.hxx | 2 +- svtools/source/uno/addrtempuno.cxx | 20 +- svtools/source/uno/contextmenuhelper.cxx | 12 +- svtools/source/uno/framestatuslistener.cxx | 12 +- svtools/source/uno/generictoolboxcontroller.cxx | 6 +- svtools/source/uno/genericunodialog.cxx | 14 +- svtools/source/uno/popupmenucontrollerbase.cxx | 28 +- svtools/source/uno/popupwindowcontroller.cxx | 20 +- svtools/source/uno/statusbarcontroller.cxx | 30 +- svtools/source/uno/svtxgridcontrol.cxx | 52 +- svtools/source/uno/svtxgridcontrol.hxx | 54 +- svtools/source/uno/toolboxcontroller.cxx | 32 +- svtools/source/uno/treecontrolpeer.cxx | 90 +-- svtools/source/uno/treecontrolpeer.hxx | 82 +-- svtools/source/uno/unoevent.cxx | 18 +- svtools/source/uno/unogridcolumnfacade.cxx | 8 +- svtools/source/uno/unoiface.cxx | 192 +++--- svtools/source/uno/unoimap.cxx | 72 +- svtools/source/uno/wizard/unowizard.cxx | 76 +-- svx/inc/tbunosearchcontrollers.hxx | 116 ++-- svx/inc/unomlstr.hxx | 4 +- .../accessibility/AccessibleControlShape.cxx | 30 +- .../accessibility/AccessibleFrameSelector.cxx | 50 +- .../accessibility/AccessibleGraphicShape.cxx | 16 +- svx/source/accessibility/AccessibleOLEShape.cxx | 18 +- svx/source/accessibility/AccessibleShape.cxx | 108 +-- .../AccessibleSvxFindReplaceDialog.cxx | 4 +- svx/source/accessibility/ChildrenManagerImpl.cxx | 6 +- svx/source/accessibility/ChildrenManagerImpl.hxx | 6 +- .../accessibility/GraphCtlAccessibleContext.cxx | 68 +- svx/source/accessibility/charmapacc.cxx | 106 +-- .../accessibility/svxpixelctlaccessiblecontext.cxx | 114 ++-- .../accessibility/svxrectctaccessiblecontext.cxx | 134 ++-- .../customshapes/EnhancedCustomShapeEngine.cxx | 32 +- .../customshapes/EnhancedCustomShapeHandle.cxx | 6 +- .../customshapes/EnhancedCustomShapeHandle.hxx | 6 +- svx/source/customshapes/tbxcustomshapes.cxx | 8 +- svx/source/dialog/docrecovery.cxx | 20 +- svx/source/dialog/rubydialog.cxx | 8 +- svx/source/fmcomp/fmgridif.cxx | 240 +++---- svx/source/fmcomp/gridcell.cxx | 206 +++--- svx/source/fmcomp/gridctrl.cxx | 4 +- svx/source/form/datalistener.cxx | 12 +- svx/source/form/filtnav.cxx | 16 +- svx/source/form/fmdmod.cxx | 6 +- svx/source/form/fmdpage.cxx | 12 +- svx/source/form/fmexch.cxx | 2 +- svx/source/form/fmscriptingenv.cxx | 12 +- svx/source/form/fmshimp.cxx | 22 +- 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 | 18 +- svx/source/form/fmvwimp.cxx | 26 +- svx/source/form/formcontroller.cxx | 204 +++--- svx/source/form/formcontrolling.cxx | 8 +- svx/source/form/formdispatchinterceptor.cxx | 14 +- svx/source/form/formfeaturedispatcher.cxx | 6 +- svx/source/form/legacyformcontroller.cxx | 60 +- svx/source/form/navigatortreemodel.cxx | 10 +- svx/source/form/xfm_addcondition.cxx | 8 +- svx/source/gallery2/galbrws2.cxx | 8 +- svx/source/inc/AccessibleFrameSelector.hxx | 50 +- svx/source/inc/GraphCtlAccessibleContext.hxx | 68 +- svx/source/inc/charmapacc.hxx | 122 ++-- svx/source/inc/datalistener.hxx | 12 +- svx/source/inc/docrecovery.hxx | 20 +- svx/source/inc/fmexch.hxx | 2 +- svx/source/inc/fmexpl.hxx | 10 +- svx/source/inc/fmshimp.hxx | 22 +- svx/source/inc/fmtextcontrolfeature.hxx | 4 +- svx/source/inc/fmundo.hxx | 12 +- svx/source/inc/fmvwimp.hxx | 26 +- svx/source/inc/formcontroller.hxx | 196 +++--- svx/source/inc/formcontrolling.hxx | 8 +- svx/source/inc/formdispatchinterceptor.hxx | 14 +- svx/source/inc/formfeaturedispatcher.hxx | 6 +- svx/source/inc/gridcell.hxx | 242 +++---- svx/source/inc/svxpixelctlaccessiblecontext.hxx | 114 ++-- svx/source/inc/svxrectctaccessiblecontext.hxx | 134 ++-- svx/source/inc/unogalthemeprovider.hxx | 26 +- svx/source/inc/xfm_addcondition.hxx | 8 +- .../sdr/contact/viewobjectcontactofunocontrol.cxx | 40 +- svx/source/sdr/primitive2d/primitivefactory2d.cxx | 8 +- svx/source/sidebar/PanelFactory.cxx | 4 +- svx/source/sidebar/SelectionChangeHandler.cxx | 4 +- svx/source/smarttags/SmartTagMgr.cxx | 6 +- svx/source/svdraw/svdoole2.cxx | 80 +-- svx/source/svdraw/svdouno.cxx | 4 +- svx/source/table/accessiblecell.cxx | 44 +- svx/source/table/accessiblecell.hxx | 44 +- svx/source/table/accessibletableshape.cxx | 172 ++--- svx/source/table/cell.cxx | 92 +-- svx/source/table/cell.hxx | 92 +-- 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 | 30 +- svx/source/table/propertyset.hxx | 34 +- svx/source/table/svdotable.cxx | 8 +- svx/source/table/tablecolumn.cxx | 14 +- svx/source/table/tablecolumn.hxx | 14 +- svx/source/table/tablecolumns.cxx | 12 +- svx/source/table/tablecolumns.hxx | 12 +- 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 | 14 +- svx/source/table/tablerow.hxx | 14 +- svx/source/table/tablerows.cxx | 12 +- svx/source/table/tablerows.hxx | 12 +- svx/source/tbxctrls/extrusioncontrols.cxx | 16 +- svx/source/tbxctrls/extrusioncontrols.hxx | 16 +- svx/source/tbxctrls/fontworkgallery.cxx | 16 +- svx/source/tbxctrls/tbcontrl.cxx | 6 +- svx/source/tbxctrls/tbunocontroller.cxx | 44 +- svx/source/tbxctrls/tbunosearchcontrollers.cxx | 116 ++-- svx/source/tbxctrls/tbxalign.cxx | 8 +- .../chinese_translation_unodialog.cxx | 32 +- .../chinese_translation_unodialog.hxx | 32 +- svx/source/unodraw/UnoGraphicExporter.cxx | 32 +- svx/source/unodraw/UnoNameItemTable.cxx | 16 +- svx/source/unodraw/UnoNameItemTable.hxx | 16 +- svx/source/unodraw/UnoNamespaceMap.cxx | 32 +- svx/source/unodraw/XPropertyTable.cxx | 104 +-- svx/source/unodraw/gluepts.cxx | 48 +- svx/source/unodraw/recoveryui.cxx | 16 +- svx/source/unodraw/shapeimpl.hxx | 12 +- svx/source/unodraw/unobtabl.cxx | 12 +- svx/source/unodraw/unoctabl.cxx | 44 +- svx/source/unodraw/unodtabl.cxx | 12 +- svx/source/unodraw/unogtabl.cxx | 12 +- svx/source/unodraw/unohtabl.cxx | 12 +- svx/source/unodraw/unomlstr.cxx | 4 +- svx/source/unodraw/unomod.cxx | 68 +- svx/source/unodraw/unomtabl.cxx | 44 +- svx/source/unodraw/unopage.cxx | 26 +- svx/source/unodraw/unopool.cxx | 14 +- svx/source/unodraw/unoshap2.cxx | 132 ++-- svx/source/unodraw/unoshap3.cxx | 32 +- svx/source/unodraw/unoshap4.cxx | 14 +- svx/source/unodraw/unoshape.cxx | 118 ++-- svx/source/unodraw/unoshcol.cxx | 48 +- svx/source/unodraw/unottabl.cxx | 12 +- svx/source/unogallery/unogalitem.cxx | 16 +- svx/source/unogallery/unogalitem.hxx | 16 +- svx/source/unogallery/unogaltheme.cxx | 30 +- svx/source/unogallery/unogaltheme.hxx | 30 +- svx/source/unogallery/unogalthemeprovider.cxx | 26 +- svx/source/xml/xmleohlp.cxx | 24 +- svx/source/xml/xmlgrhlp.cxx | 72 +- sw/inc/SwSmartTagMgr.hxx | 4 +- sw/inc/TextCursorHelper.hxx | 2 +- sw/inc/dlelstnr.hxx | 8 +- sw/inc/unochart.hxx | 106 +-- sw/inc/unocoll.hxx | 142 ++-- sw/inc/unodraw.hxx | 100 +-- sw/inc/unofieldcoll.hxx | 34 +- sw/inc/unoframe.hxx | 154 ++--- sw/inc/unoidxcoll.hxx | 20 +- sw/inc/unoparagraph.hxx | 86 +-- sw/inc/unoredline.hxx | 46 +- sw/inc/unoredlines.hxx | 26 +- sw/inc/unosett.hxx | 134 ++-- sw/inc/unosrch.hxx | 42 +- sw/inc/unostyle.hxx | 200 +++--- sw/inc/unotbl.hxx | 246 +++---- sw/inc/unotext.hxx | 68 +- sw/inc/unotextbodyhf.hxx | 46 +- sw/inc/unotextcursor.hxx | 126 ++-- sw/inc/unotextrange.hxx | 68 +- sw/inc/unotxdoc.hxx | 218 +++--- sw/source/core/access/acccell.cxx | 40 +- sw/source/core/access/acccell.hxx | 40 +- sw/source/core/access/acccontext.cxx | 50 +- sw/source/core/access/acccontext.hxx | 50 +- sw/source/core/access/accdoc.cxx | 56 +- sw/source/core/access/accdoc.hxx | 56 +- sw/source/core/access/accembedded.cxx | 12 +- sw/source/core/access/accembedded.hxx | 12 +- sw/source/core/access/accfield.cxx | 42 +- sw/source/core/access/accfield.hxx | 42 +- sw/source/core/access/accfootnote.cxx | 10 +- sw/source/core/access/accfootnote.hxx | 10 +- sw/source/core/access/accgraphic.cxx | 10 +- sw/source/core/access/accgraphic.hxx | 10 +- sw/source/core/access/accheaderfooter.cxx | 12 +- sw/source/core/access/accheaderfooter.hxx | 12 +- sw/source/core/access/acchyperlink.cxx | 18 +- sw/source/core/access/acchyperlink.hxx | 18 +- sw/source/core/access/accmap.cxx | 8 +- sw/source/core/access/accnotextframe.cxx | 56 +- sw/source/core/access/accnotextframe.hxx | 56 +- sw/source/core/access/accnotexthyperlink.cxx | 18 +- sw/source/core/access/accnotexthyperlink.hxx | 18 +- sw/source/core/access/accpage.cxx | 10 +- sw/source/core/access/accpage.hxx | 10 +- sw/source/core/access/accpara.cxx | 106 +-- sw/source/core/access/accpara.hxx | 106 +-- sw/source/core/access/accpreview.cxx | 12 +- sw/source/core/access/accpreview.hxx | 12 +- sw/source/core/access/acctable.cxx | 84 +-- sw/source/core/access/acctable.hxx | 84 +-- sw/source/core/access/acctextframe.cxx | 30 +- sw/source/core/access/acctextframe.hxx | 30 +- sw/source/core/bastyp/SwSmartTagMgr.cxx | 4 +- 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 | 2 +- sw/source/core/inc/SwXTextDefaults.hxx | 28 +- sw/source/core/inc/dumpfilter.hxx | 14 +- sw/source/core/inc/finalthreadmanager.hxx | 20 +- sw/source/core/inc/unobookmark.hxx | 62 +- sw/source/core/inc/unoevent.hxx | 6 +- sw/source/core/inc/unofield.hxx | 78 +-- sw/source/core/inc/unoflatpara.hxx | 42 +- sw/source/core/inc/unofootnote.hxx | 52 +- sw/source/core/inc/unoidx.hxx | 82 +-- sw/source/core/inc/unometa.hxx | 82 +-- sw/source/core/inc/unoparaframeenum.hxx | 10 +- sw/source/core/inc/unoport.hxx | 76 +-- sw/source/core/inc/unorefmark.hxx | 36 +- sw/source/core/inc/unosection.hxx | 58 +- sw/source/core/inc/unotextmarkup.hxx | 20 +- sw/source/core/layout/dumpfilter.cxx | 14 +- sw/source/core/ole/ndole.cxx | 12 +- sw/source/core/swg/SwXMLBlockImport.cxx | 2 +- sw/source/core/unocore/SwXTextDefaults.cxx | 28 +- sw/source/core/unocore/TextCursorHelper.cxx | 2 +- sw/source/core/unocore/unobkm.cxx | 62 +- sw/source/core/unocore/unochart.cxx | 106 +-- sw/source/core/unocore/unocoll.cxx | 192 +++--- sw/source/core/unocore/unodraw.cxx | 120 ++-- sw/source/core/unocore/unoevent.cxx | 6 +- sw/source/core/unocore/unofield.cxx | 112 ++-- sw/source/core/unocore/unoflatpara.cxx | 42 +- sw/source/core/unocore/unoframe.cxx | 154 ++--- sw/source/core/unocore/unoftn.cxx | 52 +- sw/source/core/unocore/unoidx.cxx | 166 ++--- sw/source/core/unocore/unoobj.cxx | 128 ++-- sw/source/core/unocore/unoobj2.cxx | 88 +-- sw/source/core/unocore/unoparagraph.cxx | 76 +-- sw/source/core/unocore/unoport.cxx | 60 +- sw/source/core/unocore/unoportenum.cxx | 12 +- sw/source/core/unocore/unoredline.cxx | 50 +- sw/source/core/unocore/unoredlines.cxx | 26 +- sw/source/core/unocore/unorefmk.cxx | 130 ++-- sw/source/core/unocore/unosect.cxx | 58 +- sw/source/core/unocore/unosett.cxx | 134 ++-- sw/source/core/unocore/unosrch.cxx | 42 +- sw/source/core/unocore/unostyle.cxx | 200 +++--- sw/source/core/unocore/unotbl.cxx | 246 +++---- sw/source/core/unocore/unotext.cxx | 114 ++-- sw/source/core/unocore/unotextmarkup.cxx | 20 +- sw/source/filter/html/htmlform.cxx | 24 +- sw/source/filter/ww8/rtfexportfilter.cxx | 6 +- sw/source/filter/ww8/rtfexportfilter.hxx | 6 +- sw/source/filter/xml/xmlexp.cxx | 2 +- sw/source/filter/xml/xmlexp.hxx | 2 +- sw/source/filter/xml/xmlimp.cxx | 6 +- sw/source/filter/xml/xmlimp.hxx | 6 +- sw/source/ui/dbui/dbmgr.cxx | 4 +- sw/source/ui/dbui/dbtree.cxx | 16 +- sw/source/ui/dbui/mailmergehelper.cxx | 64 +- sw/source/ui/dochdl/swdtflvr.cxx | 2 +- sw/source/ui/docvw/SidebarTxtControlAcc.cxx | 16 +- sw/source/ui/docvw/SidebarWinAcc.cxx | 4 +- sw/source/ui/docvw/srcedtw.cxx | 4 +- sw/source/ui/envelp/mailmrge.cxx | 8 +- sw/source/ui/inc/SwXFilterOptions.hxx | 18 +- sw/source/ui/inc/mailmergehelper.hxx | 64 +- sw/source/ui/inc/swdtflvr.hxx | 2 +- sw/source/ui/inc/uivwimp.hxx | 4 +- sw/source/ui/inc/unoatxt.hxx | 108 +-- sw/source/ui/inc/unodispatch.hxx | 24 +- sw/source/ui/inc/unomailmerge.hxx | 32 +- sw/source/ui/inc/unomod.hxx | 22 +- sw/source/ui/inc/unotxvw.hxx | 76 +-- sw/source/ui/inc/workctrl.hxx | 2 +- sw/source/ui/ribbar/workctrl.cxx | 2 +- sw/source/ui/sidebar/SwPanelFactory.cxx | 4 +- sw/source/ui/uiview/uivwimp.cxx | 4 +- sw/source/ui/uno/SwXDocumentSettings.cxx | 12 +- sw/source/ui/uno/SwXDocumentSettings.hxx | 12 +- sw/source/ui/uno/SwXFilterOptions.cxx | 18 +- sw/source/ui/uno/dlelstnr.cxx | 8 +- sw/source/ui/uno/swdetect.cxx | 8 +- sw/source/ui/uno/swdetect.hxx | 2 +- sw/source/ui/uno/unoatxt.cxx | 108 +-- sw/source/ui/uno/unodispatch.cxx | 24 +- sw/source/ui/uno/unomailmerge.cxx | 44 +- sw/source/ui/uno/unomod.cxx | 22 +- sw/source/ui/uno/unomodule.cxx | 18 +- sw/source/ui/uno/unomodule.hxx | 18 +- sw/source/ui/uno/unotxdoc.cxx | 218 +++--- sw/source/ui/uno/unotxvw.cxx | 76 +-- sw/source/ui/vba/vbaaddin.cxx | 12 +- sw/source/ui/vba/vbaaddin.hxx | 12 +- sw/source/ui/vba/vbaapplication.cxx | 32 +- sw/source/ui/vba/vbaapplication.hxx | 32 +- sw/source/ui/vba/vbaautotextentry.cxx | 2 +- sw/source/ui/vba/vbaautotextentry.hxx | 2 +- sw/source/ui/vba/vbabookmark.cxx | 10 +- sw/source/ui/vba/vbabookmark.hxx | 10 +- sw/source/ui/vba/vbabookmarks.cxx | 28 +- sw/source/ui/vba/vbabookmarks.hxx | 12 +- sw/source/ui/vba/vbaborders.cxx | 20 +- sw/source/ui/vba/vbaborders.hxx | 4 +- sw/source/ui/vba/vbacell.cxx | 16 +- sw/source/ui/vba/vbacell.hxx | 16 +- sw/source/ui/vba/vbacells.cxx | 30 +- sw/source/ui/vba/vbacells.hxx | 16 +- sw/source/ui/vba/vbacolumn.cxx | 6 +- sw/source/ui/vba/vbacolumn.hxx | 6 +- sw/source/ui/vba/vbacolumns.cxx | 10 +- sw/source/ui/vba/vbacolumns.hxx | 6 +- sw/source/ui/vba/vbadialogs.cxx | 2 +- sw/source/ui/vba/vbadialogs.hxx | 2 +- sw/source/ui/vba/vbadocument.cxx | 80 +-- sw/source/ui/vba/vbadocument.hxx | 80 +-- sw/source/ui/vba/vbadocumentproperties.cxx | 114 ++-- sw/source/ui/vba/vbadocumentproperties.hxx | 4 +- sw/source/ui/vba/vbadocuments.cxx | 8 +- sw/source/ui/vba/vbadocuments.hxx | 6 +- sw/source/ui/vba/vbafield.cxx | 20 +- sw/source/ui/vba/vbafield.hxx | 6 +- sw/source/ui/vba/vbafind.cxx | 48 +- sw/source/ui/vba/vbafind.hxx | 48 +- sw/source/ui/vba/vbafont.cxx | 20 +- sw/source/ui/vba/vbafont.hxx | 20 +- sw/source/ui/vba/vbaframe.cxx | 2 +- sw/source/ui/vba/vbaframe.hxx | 2 +- sw/source/ui/vba/vbaframes.cxx | 4 +- sw/source/ui/vba/vbaglobals.cxx | 26 +- sw/source/ui/vba/vbaglobals.hxx | 26 +- sw/source/ui/vba/vbaheaderfooter.cxx | 10 +- sw/source/ui/vba/vbaheaderfooter.hxx | 10 +- sw/source/ui/vba/vbaheadersfooters.cxx | 12 +- sw/source/ui/vba/vbalistformat.cxx | 4 +- sw/source/ui/vba/vbalistformat.hxx | 4 +- sw/source/ui/vba/vbalistgalleries.cxx | 4 +- sw/source/ui/vba/vbalistgallery.cxx | 2 +- sw/source/ui/vba/vbalistgallery.hxx | 2 +- sw/source/ui/vba/vbalistlevel.cxx | 46 +- sw/source/ui/vba/vbalistlevel.hxx | 46 +- sw/source/ui/vba/vbalistlevels.cxx | 4 +- sw/source/ui/vba/vbalisttemplate.cxx | 2 +- sw/source/ui/vba/vbalisttemplate.hxx | 2 +- sw/source/ui/vba/vbalisttemplates.cxx | 4 +- sw/source/ui/vba/vbaoptions.cxx | 54 +- sw/source/ui/vba/vbaoptions.hxx | 54 +- sw/source/ui/vba/vbapagesetup.cxx | 20 +- sw/source/ui/vba/vbapagesetup.hxx | 20 +- sw/source/ui/vba/vbapalette.cxx | 8 +- sw/source/ui/vba/vbapane.cxx | 4 +- sw/source/ui/vba/vbapane.hxx | 4 +- sw/source/ui/vba/vbapanes.cxx | 12 +- sw/source/ui/vba/vbaparagraph.cxx | 16 +- sw/source/ui/vba/vbaparagraph.hxx | 6 +- sw/source/ui/vba/vbaparagraphformat.cxx | 64 +- sw/source/ui/vba/vbaparagraphformat.hxx | 64 +- sw/source/ui/vba/vbarange.cxx | 50 +- sw/source/ui/vba/vbarange.hxx | 50 +- sw/source/ui/vba/vbareplacement.cxx | 6 +- sw/source/ui/vba/vbareplacement.hxx | 6 +- sw/source/ui/vba/vbarevision.cxx | 4 +- sw/source/ui/vba/vbarevision.hxx | 4 +- sw/source/ui/vba/vbarevisions.cxx | 20 +- sw/source/ui/vba/vbarevisions.hxx | 4 +- sw/source/ui/vba/vbarow.cxx | 12 +- sw/source/ui/vba/vbarow.hxx | 12 +- sw/source/ui/vba/vbarows.cxx | 22 +- sw/source/ui/vba/vbarows.hxx | 18 +- sw/source/ui/vba/vbasection.cxx | 10 +- sw/source/ui/vba/vbasection.hxx | 10 +- sw/source/ui/vba/vbasections.cxx | 18 +- sw/source/ui/vba/vbasections.hxx | 2 +- sw/source/ui/vba/vbaselection.cxx | 94 +-- sw/source/ui/vba/vbaselection.hxx | 94 +-- sw/source/ui/vba/vbastyle.cxx | 32 +- sw/source/ui/vba/vbastyle.hxx | 34 +- sw/source/ui/vba/vbastyles.cxx | 20 +- sw/source/ui/vba/vbasystem.cxx | 6 +- sw/source/ui/vba/vbasystem.hxx | 6 +- sw/source/ui/vba/vbatable.cxx | 14 +- sw/source/ui/vba/vbatable.hxx | 14 +- sw/source/ui/vba/vbatableofcontents.cxx | 20 +- sw/source/ui/vba/vbatableofcontents.hxx | 20 +- sw/source/ui/vba/vbatables.cxx | 20 +- sw/source/ui/vba/vbatables.hxx | 2 +- sw/source/ui/vba/vbatablesofcontents.cxx | 16 +- sw/source/ui/vba/vbatablesofcontents.hxx | 2 +- sw/source/ui/vba/vbatabstops.cxx | 18 +- sw/source/ui/vba/vbatabstops.hxx | 4 +- sw/source/ui/vba/vbatemplate.cxx | 6 +- sw/source/ui/vba/vbatemplate.hxx | 6 +- sw/source/ui/vba/vbavariable.cxx | 10 +- sw/source/ui/vba/vbavariable.hxx | 10 +- sw/source/ui/vba/vbavariables.cxx | 2 +- sw/source/ui/vba/vbavariables.hxx | 2 +- sw/source/ui/vba/vbaview.cxx | 16 +- sw/source/ui/vba/vbaview.hxx | 16 +- sw/source/ui/vba/vbawindow.cxx | 16 +- sw/source/ui/vba/vbawindow.hxx | 16 +- sw/source/ui/vba/vbawrapformat.cxx | 24 +- sw/source/ui/vba/vbawrapformat.hxx | 24 +- testtools/source/bridgetest/bridgetest.cxx | 18 +- testtools/source/bridgetest/constructors.cxx | 24 +- testtools/source/bridgetest/cppobj.cxx | 276 ++++---- .../source/bridgetest/currentcontextchecker.cxx | 6 +- .../source/bridgetest/currentcontextchecker.hxx | 2 +- testtools/source/bridgetest/multi.hxx | 34 +- toolkit/source/awt/animatedimagespeer.cxx | 22 +- toolkit/source/awt/asynccallback.cxx | 16 +- toolkit/source/awt/stylesettings.cxx | 220 +++--- toolkit/source/awt/stylesettings.hxx | 220 +++--- toolkit/source/awt/vclxaccessiblecomponent.cxx | 42 +- toolkit/source/awt/vclxbitmap.cxx | 8 +- toolkit/source/awt/vclxcontainer.cxx | 16 +- toolkit/source/awt/vclxdevice.cxx | 24 +- toolkit/source/awt/vclxfont.cxx | 18 +- toolkit/source/awt/vclxgraphics.cxx | 64 +- toolkit/source/awt/vclxmenu.cxx | 88 +-- toolkit/source/awt/vclxpointer.cxx | 6 +- toolkit/source/awt/vclxprinter.cxx | 32 +- 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 | 112 ++-- toolkit/source/awt/vclxtopwindow.cxx | 34 +- toolkit/source/awt/vclxwindow.cxx | 126 ++-- toolkit/source/awt/vclxwindows.cxx | 650 +++++++++--------- .../source/controls/accessiblecontrolcontext.cxx | 26 +- toolkit/source/controls/animatedimages.cxx | 80 +-- .../source/controls/controlmodelcontainerbase.cxx | 98 +-- toolkit/source/controls/dialogcontrol.cxx | 118 ++-- toolkit/source/controls/eventcontainer.cxx | 20 +- toolkit/source/controls/formattedcontrol.cxx | 12 +- toolkit/source/controls/geometrycontrolmodel.cxx | 18 +- .../controls/grid/defaultgridcolumnmodel.cxx | 52 +- .../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 | 42 +- .../source/controls/grid/grideventforwarder.cxx | 16 +- .../source/controls/grid/grideventforwarder.hxx | 16 +- .../source/controls/grid/sortablegriddatamodel.cxx | 140 ++-- toolkit/source/controls/roadmapcontrol.cxx | 46 +- toolkit/source/controls/roadmapentry.cxx | 8 +- toolkit/source/controls/spinningprogress.cxx | 16 +- toolkit/source/controls/stdtabcontroller.cxx | 20 +- toolkit/source/controls/stdtabcontrollermodel.cxx | 24 +- toolkit/source/controls/tabpagecontainer.cxx | 48 +- toolkit/source/controls/tabpagemodel.cxx | 30 +- toolkit/source/controls/tkscrollbar.cxx | 42 +- toolkit/source/controls/tkspinbutton.cxx | 94 +-- toolkit/source/controls/tree/treecontrol.cxx | 140 ++-- toolkit/source/controls/tree/treecontrol.hxx | 4 +- toolkit/source/controls/tree/treedatamodel.cxx | 132 ++-- toolkit/source/controls/unocontrol.cxx | 112 ++-- toolkit/source/controls/unocontrolcontainer.cxx | 52 +- .../source/controls/unocontrolcontainermodel.cxx | 4 +- toolkit/source/controls/unocontrolmodel.cxx | 40 +- toolkit/source/controls/unocontrols.cxx | 626 +++++++++--------- toolkit/source/helper/listenermultiplexer.cxx | 16 +- ucb/source/cacher/cachedcontentresultset.cxx | 102 +-- ucb/source/cacher/cachedcontentresultset.hxx | 88 +-- ucb/source/cacher/cachedcontentresultsetstub.cxx | 14 +- ucb/source/cacher/cachedcontentresultsetstub.hxx | 10 +- ucb/source/cacher/cacheddynamicresultset.cxx | 4 +- ucb/source/cacher/cacheddynamicresultset.hxx | 2 +- ucb/source/cacher/cacheddynamicresultsetstub.cxx | 6 +- ucb/source/cacher/cacheddynamicresultsetstub.hxx | 4 +- ucb/source/cacher/contentresultsetwrapper.cxx | 112 ++-- ucb/source/cacher/contentresultsetwrapper.hxx | 114 ++-- ucb/source/cacher/dynamicresultsetwrapper.cxx | 20 +- ucb/source/cacher/dynamicresultsetwrapper.hxx | 22 +- ucb/source/core/FileAccess.cxx | 100 +-- ucb/source/core/cmdenv.cxx | 12 +- ucb/source/core/cmdenv.hxx | 12 +- ucb/source/core/identify.cxx | 4 +- ucb/source/core/identify.hxx | 4 +- ucb/source/core/provprox.cxx | 16 +- ucb/source/core/provprox.hxx | 12 +- ucb/source/core/ucb.cxx | 34 +- ucb/source/core/ucb.hxx | 34 +- ucb/source/core/ucbcmds.cxx | 32 +- ucb/source/core/ucbprops.cxx | 6 +- ucb/source/core/ucbprops.hxx | 6 +- ucb/source/core/ucbstore.cxx | 70 +- ucb/source/core/ucbstore.hxx | 58 +- ucb/source/sorter/sortdynres.cxx | 20 +- ucb/source/sorter/sortdynres.hxx | 20 +- ucb/source/sorter/sortresult.cxx | 118 ++-- ucb/source/sorter/sortresult.hxx | 106 +-- ucb/source/ucp/cmis/cmis_content.cxx | 18 +- ucb/source/ucp/cmis/cmis_content.hxx | 14 +- ucb/source/ucp/cmis/cmis_provider.cxx | 2 +- ucb/source/ucp/cmis/cmis_provider.hxx | 2 +- ucb/source/ucp/cmis/cmis_repo_content.cxx | 14 +- ucb/source/ucp/cmis/cmis_repo_content.hxx | 10 +- ucb/source/ucp/expand/ucpexpand.cxx | 20 +- ucb/source/ucp/ext/ucpext_content.cxx | 10 +- ucb/source/ucp/ext/ucpext_content.hxx | 10 +- ucb/source/ucp/ext/ucpext_provider.cxx | 6 +- ucb/source/ucp/ext/ucpext_provider.hxx | 6 +- ucb/source/ucp/file/bc.cxx | 48 +- ucb/source/ucp/file/bc.hxx | 48 +- ucb/source/ucp/file/filcmd.cxx | 12 +- ucb/source/ucp/file/filcmd.hxx | 12 +- ucb/source/ucp/file/filid.cxx | 10 +- ucb/source/ucp/file/filid.hxx | 10 +- ucb/source/ucp/file/filinpstr.cxx | 18 +- ucb/source/ucp/file/filinpstr.hxx | 18 +- ucb/source/ucp/file/filinsreq.cxx | 8 +- ucb/source/ucp/file/filinsreq.hxx | 16 +- ucb/source/ucp/file/filprp.cxx | 8 +- ucb/source/ucp/file/filprp.hxx | 8 +- ucb/source/ucp/file/filrow.cxx | 42 +- ucb/source/ucp/file/filrow.hxx | 42 +- ucb/source/ucp/file/filrset.cxx | 78 +-- ucb/source/ucp/file/filrset.hxx | 118 ++-- ucb/source/ucp/file/filstr.cxx | 32 +- ucb/source/ucp/file/filstr.hxx | 32 +- ucb/source/ucp/file/prov.cxx | 52 +- ucb/source/ucp/file/prov.hxx | 36 +- ucb/source/ucp/ftp/ftpcontent.cxx | 14 +- ucb/source/ucp/ftp/ftpcontent.hxx | 14 +- ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 10 +- ucb/source/ucp/ftp/ftpcontentidentifier.hxx | 10 +- ucb/source/ucp/ftp/ftpcontentprovider.cxx | 2 +- ucb/source/ucp/ftp/ftpcontentprovider.hxx | 2 +- ucb/source/ucp/ftp/ftpintreq.cxx | 14 +- ucb/source/ucp/ftp/ftpintreq.hxx | 14 +- ucb/source/ucp/ftp/ftpresultsetbase.cxx | 76 +-- ucb/source/ucp/ftp/ftpresultsetbase.hxx | 108 +-- ucb/source/ucp/gio/gio_content.cxx | 18 +- ucb/source/ucp/gio/gio_content.hxx | 14 +- ucb/source/ucp/gio/gio_inputstream.cxx | 12 +- ucb/source/ucp/gio/gio_inputstream.hxx | 12 +- ucb/source/ucp/gio/gio_outputstream.cxx | 8 +- ucb/source/ucp/gio/gio_outputstream.hxx | 8 +- ucb/source/ucp/gio/gio_provider.cxx | 2 +- ucb/source/ucp/gio/gio_provider.hxx | 2 +- ucb/source/ucp/gio/gio_seekable.cxx | 10 +- ucb/source/ucp/gio/gio_seekable.hxx | 10 +- ucb/source/ucp/hierarchy/hierarchycontent.cxx | 20 +- ucb/source/ucp/hierarchy/hierarchycontent.hxx | 16 +- ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 96 +-- ucb/source/ucp/hierarchy/hierarchydatasource.hxx | 12 +- ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 4 +- ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 4 +- ucb/source/ucp/package/pkgcontent.cxx | 18 +- ucb/source/ucp/package/pkgcontent.hxx | 14 +- ucb/source/ucp/package/pkgprovider.cxx | 8 +- ucb/source/ucp/package/pkgprovider.hxx | 2 +- ucb/source/ucp/tdoc/tdoc_content.cxx | 20 +- ucb/source/ucp/tdoc/tdoc_content.hxx | 16 +- ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 10 +- ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 10 +- .../ucp/tdoc/tdoc_documentcontentfactory.cxx | 8 +- .../ucp/tdoc/tdoc_documentcontentfactory.hxx | 8 +- ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx | 24 +- ucb/source/ucp/tdoc/tdoc_provider.cxx | 4 +- ucb/source/ucp/tdoc/tdoc_provider.hxx | 4 +- ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 106 +-- ucb/source/ucp/tdoc/tdoc_stgelems.hxx | 106 +-- ucb/source/ucp/webdav-neon/NeonInputStream.cxx | 18 +- ucb/source/ucp/webdav-neon/NeonInputStream.hxx | 18 +- ucb/source/ucp/webdav-neon/webdavcontent.cxx | 22 +- ucb/source/ucp/webdav-neon/webdavcontent.hxx | 18 +- ucb/source/ucp/webdav-neon/webdavprovider.cxx | 2 +- ucb/source/ucp/webdav-neon/webdavprovider.hxx | 2 +- ucbhelper/source/client/activedatasink.cxx | 4 +- ucbhelper/source/client/activedatastreamer.cxx | 4 +- ucbhelper/source/client/commandenvironment.cxx | 4 +- ucbhelper/source/client/content.cxx | 28 +- ucbhelper/source/client/interceptedinteraction.cxx | 2 +- ucbhelper/source/client/proxydecider.cxx | 8 +- ucbhelper/source/provider/contenthelper.cxx | 38 +- ucbhelper/source/provider/contentidentifier.cxx | 10 +- ucbhelper/source/provider/contentinfo.cxx | 16 +- ucbhelper/source/provider/fd_inputstream.cxx | 16 +- ucbhelper/source/provider/interactionrequest.cxx | 96 +-- ucbhelper/source/provider/propertyvalueset.cxx | 42 +- ucbhelper/source/provider/providerhelper.cxx | 4 +- ucbhelper/source/provider/resultset.cxx | 118 ++-- ucbhelper/source/provider/resultsethelper.cxx | 14 +- ucbhelper/source/provider/resultsetmetadata.cxx | 42 +- ucbhelper/source/provider/std_inputstream.cxx | 18 +- ucbhelper/source/provider/std_outputstream.cxx | 8 +- .../accessibility/accessiblerelationsethelper.cxx | 12 +- .../accessibility/accessiblestatesethelper.cxx | 12 +- unotools/source/config/configitem.cxx | 8 +- unotools/source/config/eventcfg.cxx | 14 +- unotools/source/config/itemholder1.cxx | 2 +- unotools/source/config/itemholder1.hxx | 2 +- unotools/source/config/useroptions.cxx | 8 +- unotools/source/config/xmlaccelcfg.cxx | 18 +- unotools/source/misc/closeveto.cxx | 12 +- .../source/misc/desktopterminationobserver.cxx | 12 +- unotools/source/misc/eventlisteneradapter.cxx | 4 +- unotools/source/misc/sharedunocomponent.cxx | 12 +- unotools/source/streaming/streamhelper.cxx | 16 +- unotools/source/streaming/streamwrap.cxx | 42 +- unotools/source/ucbhelper/XTempFile.hxx | 48 +- unotools/source/ucbhelper/progresshandlerwrap.cxx | 6 +- unotools/source/ucbhelper/ucblockbytes.cxx | 68 +- unotools/source/ucbhelper/xtempfile.cxx | 48 +- unoxml/source/dom/attr.cxx | 22 +- unoxml/source/dom/attr.hxx | 60 +- unoxml/source/dom/attributesmap.cxx | 16 +- unoxml/source/dom/attributesmap.hxx | 16 +- unoxml/source/dom/cdatasection.cxx | 4 +- unoxml/source/dom/cdatasection.hxx | 68 +- unoxml/source/dom/characterdata.cxx | 16 +- unoxml/source/dom/characterdata.hxx | 66 +- unoxml/source/dom/childlist.cxx | 4 +- unoxml/source/dom/childlist.hxx | 4 +- unoxml/source/dom/comment.cxx | 4 +- unoxml/source/dom/comment.hxx | 66 +- unoxml/source/dom/document.cxx | 58 +- unoxml/source/dom/document.hxx | 102 +-- unoxml/source/dom/documentbuilder.cxx | 24 +- unoxml/source/dom/documentbuilder.hxx | 22 +- unoxml/source/dom/documentfragment.cxx | 4 +- unoxml/source/dom/documentfragment.hxx | 50 +- unoxml/source/dom/documenttype.cxx | 16 +- unoxml/source/dom/documenttype.hxx | 62 +- unoxml/source/dom/domimplementation.cxx | 6 +- unoxml/source/dom/domimplementation.hxx | 6 +- unoxml/source/dom/element.cxx | 40 +- unoxml/source/dom/element.hxx | 82 +-- unoxml/source/dom/elementlist.cxx | 6 +- unoxml/source/dom/elementlist.hxx | 6 +- unoxml/source/dom/entitiesmap.cxx | 16 +- unoxml/source/dom/entitiesmap.hxx | 16 +- unoxml/source/dom/entity.cxx | 10 +- unoxml/source/dom/entity.hxx | 56 +- unoxml/source/dom/entityreference.cxx | 4 +- unoxml/source/dom/entityreference.hxx | 50 +- unoxml/source/dom/node.cxx | 58 +- unoxml/source/dom/node.hxx | 58 +- unoxml/source/dom/notation.cxx | 8 +- unoxml/source/dom/notation.hxx | 54 +- unoxml/source/dom/notationsmap.cxx | 16 +- unoxml/source/dom/notationsmap.hxx | 16 +- unoxml/source/dom/processinginstruction.cxx | 12 +- unoxml/source/dom/processinginstruction.hxx | 56 +- unoxml/source/dom/saxbuilder.cxx | 34 +- unoxml/source/dom/saxbuilder.hxx | 34 +- unoxml/source/dom/text.cxx | 4 +- unoxml/source/dom/text.hxx | 68 +- unoxml/source/events/event.cxx | 20 +- unoxml/source/events/event.hxx | 20 +- unoxml/source/events/mouseevent.cxx | 48 +- unoxml/source/events/mouseevent.hxx | 48 +- unoxml/source/events/mutationevent.cxx | 32 +- unoxml/source/events/mutationevent.hxx | 32 +- unoxml/source/events/testlistener.cxx | 10 +- unoxml/source/events/testlistener.hxx | 10 +- unoxml/source/events/uievent.cxx | 26 +- unoxml/source/events/uievent.hxx | 26 +- unoxml/source/rdf/CBlankNode.cxx | 20 +- unoxml/source/rdf/CLiteral.cxx | 32 +- unoxml/source/rdf/CURI.cxx | 28 +- unoxml/source/rdf/librdf_repository.cxx | 128 ++-- unoxml/source/xpath/nodelist.cxx | 4 +- unoxml/source/xpath/nodelist.hxx | 4 +- unoxml/source/xpath/xpathapi.cxx | 26 +- unoxml/source/xpath/xpathapi.hxx | 26 +- unoxml/source/xpath/xpathobject.cxx | 20 +- unoxml/source/xpath/xpathobject.hxx | 20 +- uui/source/fltdlg.cxx | 2 +- uui/source/interactionhandler.cxx | 24 +- uui/source/passwordcontainer.cxx | 10 +- uui/source/passwordcontainer.hxx | 10 +- uui/source/requeststringresolver.cxx | 8 +- uui/source/requeststringresolver.hxx | 8 +- vbahelper/source/msforms/vbabutton.cxx | 26 +- vbahelper/source/msforms/vbabutton.hxx | 26 +- 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 | 68 +- vbahelper/source/msforms/vbacontrol.hxx | 60 +- vbahelper/source/msforms/vbacontrols.cxx | 24 +- vbahelper/source/msforms/vbacontrols.hxx | 6 +- 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/vbamultipage.cxx | 14 +- vbahelper/source/msforms/vbamultipage.hxx | 6 +- vbahelper/source/msforms/vbanewfont.cxx | 32 +- vbahelper/source/msforms/vbanewfont.hxx | 32 +- 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 | 12 +- vbahelper/source/msforms/vbasystemaxcontrol.hxx | 12 +- vbahelper/source/msforms/vbatextbox.cxx | 40 +- vbahelper/source/msforms/vbatextbox.hxx | 42 +- vbahelper/source/msforms/vbatogglebutton.cxx | 30 +- vbahelper/source/msforms/vbatogglebutton.hxx | 32 +- vbahelper/source/msforms/vbauserform.cxx | 38 +- vbahelper/source/msforms/vbauserform.hxx | 38 +- vbahelper/source/vbahelper/vbaapplicationbase.cxx | 34 +- vbahelper/source/vbahelper/vbacolorformat.cxx | 8 +- vbahelper/source/vbahelper/vbacolorformat.hxx | 8 +- vbahelper/source/vbahelper/vbacommandbar.cxx | 40 +- vbahelper/source/vbahelper/vbacommandbar.hxx | 40 +- .../source/vbahelper/vbacommandbarcontrol.cxx | 24 +- .../source/vbahelper/vbacommandbarcontrol.hxx | 30 +- .../source/vbahelper/vbacommandbarcontrols.cxx | 16 +- .../source/vbahelper/vbacommandbarcontrols.hxx | 4 +- vbahelper/source/vbahelper/vbacommandbars.cxx | 6 +- vbahelper/source/vbahelper/vbacommandbars.hxx | 2 +- vbahelper/source/vbahelper/vbadialogbase.cxx | 2 +- vbahelper/source/vbahelper/vbadialogsbase.cxx | 4 +- vbahelper/source/vbahelper/vbadocumentbase.cxx | 20 +- vbahelper/source/vbahelper/vbadocumentsbase.cxx | 20 +- vbahelper/source/vbahelper/vbaeventshelperbase.cxx | 10 +- vbahelper/source/vbahelper/vbafillformat.cxx | 16 +- vbahelper/source/vbahelper/vbafillformat.hxx | 16 +- vbahelper/source/vbahelper/vbafontbase.cxx | 40 +- vbahelper/source/vbahelper/vbaglobalbase.cxx | 6 +- vbahelper/source/vbahelper/vbalineformat.cxx | 48 +- vbahelper/source/vbahelper/vbalineformat.hxx | 48 +- vbahelper/source/vbahelper/vbapagesetupbase.cxx | 20 +- vbahelper/source/vbahelper/vbapictureformat.cxx | 12 +- vbahelper/source/vbahelper/vbapictureformat.hxx | 12 +- vbahelper/source/vbahelper/vbapropvalue.cxx | 4 +- vbahelper/source/vbahelper/vbashape.cxx | 82 +-- vbahelper/source/vbahelper/vbashaperange.cxx | 60 +- vbahelper/source/vbahelper/vbashapes.cxx | 14 +- vbahelper/source/vbahelper/vbatextframe.cxx | 22 +- vbahelper/source/vbahelper/vbawindowbase.cxx | 20 +- vcl/inc/canvasbitmap.hxx | 64 +- vcl/inc/dndevdis.hxx | 18 +- vcl/inc/dndlcon.hxx | 28 +- vcl/inc/osx/a11ylistener.hxx | 4 +- vcl/inc/xconnection.hxx | 10 +- vcl/osx/DragSource.cxx | 14 +- vcl/osx/DragSource.hxx | 14 +- vcl/osx/DragSourceContext.cxx | 8 +- vcl/osx/DragSourceContext.hxx | 8 +- vcl/osx/DropTarget.cxx | 30 +- vcl/osx/DropTarget.hxx | 30 +- vcl/osx/OSXTransferable.cxx | 6 +- vcl/osx/OSXTransferable.hxx | 6 +- vcl/osx/a11ylistener.cxx | 4 +- vcl/osx/clipboard.cxx | 20 +- vcl/osx/clipboard.hxx | 20 +- vcl/osx/documentfocuslistener.cxx | 4 +- vcl/osx/documentfocuslistener.hxx | 4 +- vcl/qa/cppunit/canvasbitmaptest.cxx | 28 +- vcl/source/app/dndhelp.cxx | 26 +- vcl/source/app/session.cxx | 24 +- vcl/source/app/svdata.cxx | 4 +- vcl/source/app/svmain.cxx | 8 +- vcl/source/app/unohelp2.cxx | 8 +- vcl/source/components/dtranscomp.cxx | 88 +-- vcl/source/components/fontident.cxx | 20 +- vcl/source/control/edit.cxx | 12 +- vcl/source/edit/textview.cxx | 28 +- vcl/source/filter/graphicfilter.cxx | 6 +- vcl/source/gdi/pdfwriter_impl.cxx | 12 +- vcl/source/gdi/pdfwriter_impl2.cxx | 2 +- vcl/source/helper/canvasbitmap.cxx | 64 +- vcl/source/helper/canvastools.cxx | 22 +- vcl/source/helper/xconnection.cxx | 10 +- vcl/source/window/dndevdis.cxx | 18 +- vcl/source/window/dndlcon.cxx | 28 +- vcl/unx/generic/dtrans/X11_clipboard.cxx | 18 +- vcl/unx/generic/dtrans/X11_clipboard.hxx | 18 +- 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 | 30 +- vcl/unx/generic/dtrans/X11_selection.hxx | 50 +- vcl/unx/generic/dtrans/X11_transferable.cxx | 6 +- vcl/unx/generic/dtrans/X11_transferable.hxx | 6 +- vcl/unx/gtk/a11y/atklistener.cxx | 4 +- vcl/unx/gtk/a11y/atklistener.hxx | 4 +- vcl/unx/gtk/a11y/atkutil.cxx | 8 +- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 56 +- vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 56 +- vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 14 +- vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 14 +- vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 6 +- vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 20 +- vcl/unx/kde/UnxFilePicker.cxx | 48 +- vcl/unx/kde/UnxFilePicker.hxx | 48 +- vcl/unx/kde4/KDE4FilePicker.cxx | 48 +- vcl/unx/kde4/KDE4FilePicker.hxx | 48 +- writerfilter/source/dmapper/GraphicImport.cxx | 20 +- writerfilter/source/dmapper/ModelEventListener.cxx | 4 +- writerfilter/source/dmapper/ModelEventListener.hxx | 4 +- writerfilter/source/filter/ImportFilter.cxx | 16 +- writerfilter/source/filter/RtfFilter.cxx | 16 +- writerfilter/source/filter/RtfFilter.hxx | 16 +- writerfilter/source/filter/WriterFilter.hxx | 16 +- .../source/filter/WriterFilterDetection.cxx | 8 +- .../source/filter/WriterFilterDetection.hxx | 8 +- .../source/ooxml/OOXMLFastContextHandler.cxx | 28 +- .../source/ooxml/OOXMLFastContextHandler.hxx | 28 +- .../source/ooxml/OOXMLFastDocumentHandler.cxx | 20 +- .../source/ooxml/OOXMLFastDocumentHandler.hxx | 20 +- .../source/ooxml/OOXMLFastTokenHandler.cxx | 8 +- .../source/ooxml/OOXMLFastTokenHandler.hxx | 8 +- writerperfect/source/draw/CDRImportFilter.cxx | 16 +- writerperfect/source/draw/CDRImportFilter.hxx | 16 +- writerperfect/source/draw/CMXImportFilter.cxx | 16 +- writerperfect/source/draw/CMXImportFilter.hxx | 16 +- writerperfect/source/draw/FreehandImportFilter.cxx | 16 +- writerperfect/source/draw/FreehandImportFilter.hxx | 16 +- writerperfect/source/draw/MSPUBImportFilter.cxx | 16 +- writerperfect/source/draw/MSPUBImportFilter.hxx | 16 +- writerperfect/source/draw/VisioImportFilter.cxx | 16 +- writerperfect/source/draw/VisioImportFilter.hxx | 16 +- writerperfect/source/draw/WPGImportFilter.cxx | 16 +- writerperfect/source/draw/WPGImportFilter.hxx | 16 +- .../source/impress/KeynoteImportFilter.cxx | 16 +- .../source/impress/KeynoteImportFilter.hxx | 16 +- .../source/writer/AbiWordImportFilter.cxx | 16 +- .../source/writer/AbiWordImportFilter.hxx | 16 +- writerperfect/source/writer/EBookImportFilter.cxx | 16 +- writerperfect/source/writer/EBookImportFilter.hxx | 16 +- .../source/writer/MSWorksImportFilter.cxx | 16 +- .../source/writer/MSWorksImportFilter.hxx | 16 +- writerperfect/source/writer/MWAWImportFilter.cxx | 16 +- writerperfect/source/writer/MWAWImportFilter.hxx | 16 +- .../source/writer/WordPerfectImportFilter.cxx | 30 +- .../source/writer/WordPerfectImportFilter.hxx | 30 +- xmlhelp/source/cxxhelp/inc/tvfactory.hxx | 14 +- xmlhelp/source/cxxhelp/inc/tvread.hxx | 46 +- .../cxxhelp/provider/bufferedinputstream.cxx | 18 +- .../cxxhelp/provider/bufferedinputstream.hxx | 18 +- xmlhelp/source/cxxhelp/provider/content.cxx | 14 +- xmlhelp/source/cxxhelp/provider/content.hxx | 10 +- xmlhelp/source/cxxhelp/provider/inputstream.cxx | 18 +- xmlhelp/source/cxxhelp/provider/inputstream.hxx | 18 +- xmlhelp/source/cxxhelp/provider/provider.cxx | 12 +- xmlhelp/source/cxxhelp/provider/provider.hxx | 16 +- xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 76 +-- xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 108 +-- xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 36 +- xmlhelp/source/treeview/tvfactory.cxx | 14 +- xmlhelp/source/treeview/tvread.cxx | 22 +- xmloff/inc/MetaExportComponent.hxx | 2 +- xmloff/inc/MetaImportComponent.hxx | 2 +- xmloff/inc/SchXMLImport.hxx | 2 +- xmloff/inc/StyleMap.hxx | 2 +- xmloff/inc/XMLBasicExportFilter.hxx | 16 +- xmloff/inc/xmlversion.hxx | 4 +- xmloff/source/chart/ColorPropertySet.cxx | 34 +- xmloff/source/chart/ColorPropertySet.hxx | 22 +- xmloff/source/chart/SchXMLImport.cxx | 2 +- xmloff/source/core/PropertySetMerger.cxx | 56 +- xmloff/source/core/XMLBasicExportFilter.cxx | 16 +- .../source/core/XMLEmbeddedObjectExportFilter.cxx | 34 +- xmloff/source/core/attrlist.cxx | 16 +- xmloff/source/core/unoatrcn.cxx | 24 +- xmloff/source/core/xmlexp.cxx | 24 +- xmloff/source/core/xmlimp.cxx | 42 +- xmloff/source/draw/animationimport.cxx | 8 +- xmloff/source/draw/sdxmlexp.cxx | 2 +- 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/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 | 2 +- xmloff/source/meta/MetaImportComponent.cxx | 2 +- xmloff/source/meta/xmlmetae.cxx | 16 +- xmloff/source/meta/xmlversion.cxx | 4 +- xmloff/source/style/StyleMap.cxx | 2 +- xmloff/source/text/XMLAutoTextEventExport.cxx | 2 +- xmloff/source/text/XMLAutoTextEventExport.hxx | 2 +- xmloff/source/text/XMLAutoTextEventImport.cxx | 2 +- xmloff/source/text/XMLAutoTextEventImport.hxx | 2 +- xmloff/source/transform/MutableAttrList.cxx | 16 +- xmloff/source/transform/MutableAttrList.hxx | 16 +- xmloff/source/transform/OOo2Oasis.cxx | 22 +- xmloff/source/transform/OOo2Oasis.hxx | 22 +- xmloff/source/transform/Oasis2OOo.cxx | 8 +- xmloff/source/transform/Oasis2OOo.hxx | 8 +- xmloff/source/transform/TransformerBase.cxx | 28 +- xmloff/source/transform/TransformerBase.hxx | 28 +- xmlscript/source/xml_helper/xml_byteseq.cxx | 32 +- xmlscript/source/xml_helper/xml_element.cxx | 12 +- xmlscript/source/xml_helper/xml_impctx.cxx | 92 +-- xmlscript/source/xmldlg_imexp/imp_share.hxx | 146 ++-- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx | 4 +- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 116 ++-- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 30 +- xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 18 +- xmlscript/source/xmlflat_imexp/xmlbas_export.hxx | 18 +- xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 72 +- xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 72 +- xmlscript/source/xmllib_imexp/imp_share.hxx | 36 +- xmlscript/source/xmllib_imexp/xmllib_import.cxx | 36 +- xmlscript/source/xmlmod_imexp/imp_share.hxx | 28 +- xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 28 +- .../source/component/certificatecontainer.cxx | 10 +- .../source/component/certificatecontainer.hxx | 10 +- .../source/component/documentdigitalsignatures.cxx | 40 +- .../source/component/documentdigitalsignatures.hxx | 40 +- xmlsecurity/source/framework/decryptorimpl.cxx | 12 +- xmlsecurity/source/framework/decryptorimpl.hxx | 12 +- xmlsecurity/source/framework/encryptionengine.cxx | 2 +- xmlsecurity/source/framework/encryptionengine.hxx | 2 +- xmlsecurity/source/framework/encryptorimpl.cxx | 16 +- xmlsecurity/source/framework/encryptorimpl.hxx | 16 +- .../source/framework/saxeventkeeperimpl.cxx | 58 +- .../source/framework/saxeventkeeperimpl.hxx | 58 +- xmlsecurity/source/framework/securityengine.cxx | 6 +- xmlsecurity/source/framework/securityengine.hxx | 6 +- .../source/framework/signaturecreatorimpl.cxx | 14 +- .../source/framework/signaturecreatorimpl.hxx | 14 +- xmlsecurity/source/framework/signatureengine.cxx | 8 +- xmlsecurity/source/framework/signatureengine.hxx | 8 +- .../source/framework/signatureverifierimpl.cxx | 12 +- .../source/framework/signatureverifierimpl.hxx | 12 +- .../source/framework/xmlencryptiontemplateimpl.cxx | 18 +- .../source/framework/xmlencryptiontemplateimpl.hxx | 18 +- .../source/framework/xmlsignaturetemplateimpl.cxx | 22 +- .../source/framework/xmlsignaturetemplateimpl.hxx | 22 +- xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 24 +- xmlsecurity/source/helper/xmlsignaturehelper2.hxx | 24 +- xmlsecurity/source/helper/xsecctl.cxx | 10 +- xmlsecurity/source/helper/xsecctl.hxx | 10 +- xmlsecurity/source/helper/xsecparser.cxx | 18 +- xmlsecurity/source/helper/xsecparser.hxx | 18 +- .../xmlsec/certificateextension_xmlsecimpl.cxx | 6 +- .../xmlsec/certificateextension_xmlsecimpl.hxx | 6 +- xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 4 +- xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 4 +- xmlsecurity/source/xmlsec/nss/digestcontext.cxx | 4 +- xmlsecurity/source/xmlsec/nss/digestcontext.hxx | 4 +- xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 10 +- xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 10 +- .../source/xmlsec/nss/sanextension_nssimpl.cxx | 8 +- .../source/xmlsec/nss/sanextension_nssimpl.hxx | 8 +- .../xmlsec/nss/securityenvironment_nssimpl.cxx | 24 +- .../xmlsec/nss/securityenvironment_nssimpl.hxx | 24 +- .../source/xmlsec/nss/seinitializer_nssimpl.cxx | 10 +- .../source/xmlsec/nss/seinitializer_nssimpl.hxx | 10 +- .../source/xmlsec/nss/x509certificate_nssimpl.cxx | 36 +- .../source/xmlsec/nss/x509certificate_nssimpl.hxx | 36 +- .../source/xmlsec/nss/xmlencryption_nssimpl.cxx | 10 +- .../source/xmlsec/nss/xmlencryption_nssimpl.hxx | 10 +- .../xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 18 +- .../xmlsec/nss/xmlsecuritycontext_nssimpl.hxx | 18 +- .../source/xmlsec/nss/xmlsignature_nssimpl.cxx | 10 +- .../source/xmlsec/nss/xmlsignature_nssimpl.hxx | 10 +- xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 10 +- .../xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 60 +- .../xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 60 +- .../source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 8 +- .../source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 8 +- 3925 files changed, 61109 insertions(+), 61109 deletions(-) diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index 11650824a878..6f5b7f7a5a1b 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -114,7 +114,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XTypeProvider @@ -134,7 +134,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XAggregation @@ -155,7 +155,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XControl @@ -177,7 +177,7 @@ public: virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -194,7 +194,7 @@ public: virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -210,7 +210,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XComponent @@ -229,7 +229,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XEventListener @@ -248,7 +248,7 @@ public: @onerror - */ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XControlContainer @@ -270,7 +270,7 @@ public: virtual void SAL_CALL addControl( const OUString& sName , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -304,7 +304,7 @@ public: virtual void SAL_CALL removeControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& xControl - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -338,7 +338,7 @@ public: virtual void SAL_CALL setStatusText( const OUString& sStatusText - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -355,7 +355,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getControl( const OUString& sName - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -371,7 +371,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XUnoControlContainer @@ -461,7 +461,7 @@ public: @onerror - */ - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // protected methods diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 68c47e69f471..55676b5f2374 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -183,7 +183,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -235,7 +235,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short get implementation id @@ -252,7 +252,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XAggregation @@ -273,7 +273,7 @@ public: virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDelegator - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -290,7 +290,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo @@ -311,7 +311,7 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -327,7 +327,7 @@ public: */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -343,7 +343,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XComponent @@ -362,7 +362,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -379,7 +379,7 @@ public: virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -396,7 +396,7 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XControl @@ -418,7 +418,7 @@ public: virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -435,7 +435,7 @@ public: virtual void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xContext - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -452,7 +452,7 @@ public: virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel - ) throw( ::com::sun::star::uno::RuntimeException ) = 0 ; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0 ; /**_______________________________________________________________________________________________________ @short - @@ -467,7 +467,7 @@ public: @onerror - */ - virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -483,7 +483,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -499,7 +499,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException ) = 0; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; /**_______________________________________________________________________________________________________ @short - @@ -515,7 +515,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -531,7 +531,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -546,7 +546,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL isDesignMode() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL isDesignMode() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -561,7 +561,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XWindow @@ -584,7 +584,7 @@ public: sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); + sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -599,7 +599,7 @@ public: @onerror - */ - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -614,7 +614,7 @@ public: @onerror - */ - virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -629,7 +629,7 @@ public: @onerror - */ - virtual void SAL_CALL setFocus() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -644,7 +644,7 @@ public: @onerror - */ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -661,7 +661,7 @@ public: virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -678,7 +678,7 @@ public: virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -695,7 +695,7 @@ public: virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -712,7 +712,7 @@ public: virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -729,7 +729,7 @@ public: virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -746,7 +746,7 @@ public: virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -763,7 +763,7 @@ public: virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -780,7 +780,7 @@ public: virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -797,7 +797,7 @@ public: virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -814,7 +814,7 @@ public: virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -831,7 +831,7 @@ public: virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -848,7 +848,7 @@ public: virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XView @@ -868,7 +868,7 @@ public: */ virtual void SAL_CALL draw( sal_Int32 nX , - sal_Int32 nY ) throw( ::com::sun::star::uno::RuntimeException ); + sal_Int32 nY ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -885,7 +885,7 @@ public: virtual sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -901,7 +901,7 @@ public: */ virtual void SAL_CALL setZoom( float fZoomX , - float fZoomY ) throw( ::com::sun::star::uno::RuntimeException ); + float fZoomY ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -917,7 +917,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -932,7 +932,7 @@ public: @onerror - */ - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // ::com::sun::star::lang::XEventListener @@ -953,7 +953,7 @@ public: virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XPaintListener @@ -974,7 +974,7 @@ public: virtual void SAL_CALL windowPaint( const ::com::sun::star::awt::PaintEvent& rEvent - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XWindowListener @@ -993,10 +993,10 @@ public: @onerror - */ - virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL windowResized( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowMoved( const ::com::sun::star::awt::WindowEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowShown( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL windowHidden( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // impl but public method to register service diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index d712bef8e0cb..09aaebe20941 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -141,7 +141,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -294,7 +294,7 @@ public: */ virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aSource) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; // XFocusListener @@ -315,7 +315,7 @@ public: */ virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -332,7 +332,7 @@ public: */ virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; // XWindowListener @@ -353,7 +353,7 @@ public: */ virtual void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -370,7 +370,7 @@ public: */ virtual void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -387,7 +387,7 @@ public: */ virtual void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -404,7 +404,7 @@ public: */ virtual void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; // XKeyListener @@ -425,7 +425,7 @@ public: */ virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -442,7 +442,7 @@ public: */ virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; // XMouseListener @@ -463,7 +463,7 @@ public: */ virtual void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -480,7 +480,7 @@ public: */ virtual void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -497,7 +497,7 @@ public: */ virtual void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -514,7 +514,7 @@ public: */ virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; // XMouseMotionListener @@ -535,7 +535,7 @@ public: */ virtual void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -552,7 +552,7 @@ public: */ virtual void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; // XPaintListener @@ -573,7 +573,7 @@ public: */ virtual void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; // XTopWindowListener @@ -594,7 +594,7 @@ public: */ virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -611,7 +611,7 @@ public: */ virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -628,7 +628,7 @@ public: */ virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -645,7 +645,7 @@ public: */ virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -662,7 +662,7 @@ public: */ virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -679,7 +679,7 @@ public: */ virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; /**_______________________________________________________________________________________________________ @short - @@ -696,7 +696,7 @@ public: */ virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ) ; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) ; // protected methods diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx index ae63f0b57730..5806504520b4 100644 --- a/UnoControls/source/base/basecontainercontrol.cxx +++ b/UnoControls/source/base/basecontainercontrol.cxx @@ -54,7 +54,7 @@ BaseContainerControl::~BaseContainerControl() // XInterface -Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException ) +Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -79,7 +79,7 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru // XTypeProvider -Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException ) +Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -111,7 +111,7 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti // XAggregation -Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException ) +Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -139,7 +139,7 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >& xToolkit , - const Reference< XWindowPeer >& xParent ) throw( RuntimeException ) + const Reference< XWindowPeer >& xParent ) throw( RuntimeException, std::exception ) { if ( !getPeer().is() ) { @@ -165,7 +165,7 @@ void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >& // XControl -sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException ) +sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException, std::exception ) { // This object has NO model. return sal_False ; @@ -175,7 +175,7 @@ sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel // XControl -Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException ) +Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException, std::exception ) { // This object has NO model. // return (XControlModel*)this ; @@ -186,7 +186,7 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt // XComponent -void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException ) +void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exception ) { // Tell everything that this container is now gone. // It's faster if you listen to both the control and the container. @@ -227,7 +227,7 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException ) // XEventListener -void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException ) +void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException, std::exception ) { Reference< XControl > xControl( rEvent.Source, UNO_QUERY ); @@ -239,7 +239,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 ) +void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException, std::exception ) { if ( !rControl.is () ) return; @@ -310,7 +310,7 @@ void SAL_CALL BaseContainerControl::addContainerListener ( const Reference< XCon // XControlContainer -void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException ) +void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException, std::exception ) { if ( rControl.is() ) { @@ -375,7 +375,7 @@ void SAL_CALL BaseContainerControl::removeContainerListener ( const Reference< X // XControlContainer -void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException ) +void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException, std::exception ) { // go down to each parent Reference< XControlContainer > xContainer ( getContext(), UNO_QUERY ) ; @@ -390,7 +390,7 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText // XControlContainer -Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException ) +Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( Mutex::getGlobalMutex() ) ; @@ -418,7 +418,7 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString // XControlContainer -Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException ) +Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( Mutex::getGlobalMutex() ) ; @@ -513,7 +513,7 @@ Sequence > SAL_CALL BaseContainerControl::getTabCont // XWindow -void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException ) +void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException, std::exception ) { // override baseclass definition BaseControl::setVisible ( bVisible ) ; diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index b355344467b3..064785105504 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -78,7 +78,7 @@ BaseControl::~BaseControl() // XInterface -Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException ) +Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { Any aReturn ; if ( m_xDelegator.is() ) @@ -126,7 +126,7 @@ void SAL_CALL BaseControl::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException ) +Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -163,7 +163,7 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException ) // XTypeProvider -Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException ) +Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException, std::exception ) { // Create one Id for all instances of this class. // Use ethernet address to do this! (sal_True) @@ -195,7 +195,7 @@ Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeE // XAggregation -void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException ) +void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -206,7 +206,7 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t // XAggregation -Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException ) +Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -237,7 +237,7 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx // XServiceInfo -OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } @@ -246,7 +246,7 @@ OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException ) // XServiceInfo -sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } @@ -255,7 +255,7 @@ sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) t // XServiceInfo -Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } @@ -264,7 +264,7 @@ Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( Run // XComponent -void SAL_CALL BaseControl::dispose() throw( RuntimeException ) +void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -293,7 +293,7 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException ) // XComponent -void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -304,7 +304,7 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& // XComponent -void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -316,7 +316,7 @@ void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToolkit , - const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException ) + const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -378,7 +378,7 @@ void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToo // XControl -void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException ) +void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -389,7 +389,7 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) // XControl -void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException ) +void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -400,7 +400,7 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException // XControl -Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException ) +Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -411,7 +411,7 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti // XControl -Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException ) +Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -422,7 +422,7 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException // XControl -Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException ) +Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -433,7 +433,7 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException ) // XControl -sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException ) +sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -444,7 +444,7 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException ) // XControl -sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException ) +sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException, std::exception ) { return sal_False ; } @@ -457,7 +457,7 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( RuntimeException ) + sal_Int16 nFlags ) throw( RuntimeException, std::exception ) { // - change size and position of window and save the values @@ -496,7 +496,7 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , // XWindow -void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException ) +void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -515,7 +515,7 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti // XWindow -void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException ) +void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -534,7 +534,7 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException // XWindow -void SAL_CALL BaseControl::setFocus() throw( RuntimeException ) +void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -549,7 +549,7 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException ) // XWindow -Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException ) +Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -560,7 +560,7 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException ) // XWindow -void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener ); } @@ -569,7 +569,7 @@ void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener > // XWindow -void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener ); } @@ -578,7 +578,7 @@ void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& // XWindow -void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener ); } @@ -587,7 +587,7 @@ void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xLis // XWindow -void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener ); } @@ -596,7 +596,7 @@ void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& // XWindow -void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener ); } @@ -605,7 +605,7 @@ void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotion // XWindow -void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->advise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener ); } @@ -614,7 +614,7 @@ void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& // XWindow -void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XWindowListener >*)0), xListener ); } @@ -623,7 +623,7 @@ void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListene // XWindow -void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XFocusListener >*)0), xListener ); } @@ -632,7 +632,7 @@ void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener // XWindow -void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XKeyListener >*)0), xListener ); } @@ -641,7 +641,7 @@ void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& x // XWindow -void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseListener >*)0), xListener ); } @@ -650,7 +650,7 @@ void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener // XWindow -void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XMouseMotionListener >*)0), xListener ); } @@ -659,7 +659,7 @@ void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMo // XWindow -void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException ) +void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception ) { impl_getMultiplexer()->unadvise( ::getCppuType(( const Reference< XPaintListener >*)0), xListener ); } @@ -669,7 +669,7 @@ void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener void SAL_CALL BaseControl::draw( sal_Int32 nX , - sal_Int32 nY ) throw( RuntimeException ) + sal_Int32 nY ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -684,7 +684,7 @@ void SAL_CALL BaseControl::draw( sal_Int32 nX , // XView -sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException ) +sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException, std::exception ) { // - set the graphics for an view // - in this class exist 2 graphics-member ... one for peer[_xGraphicsPeer] and one for view[_xGraphicsView] @@ -707,7 +707,7 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic void SAL_CALL BaseControl::setZoom( float /*fZoomX*/ , - float /*fZoomY*/ ) throw( RuntimeException ) + float /*fZoomY*/ ) throw( RuntimeException, std::exception ) { // Not implemented yet } @@ -716,7 +716,7 @@ void SAL_CALL BaseControl::setZoom( float /*fZoomX*/ , // XView -Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException ) +Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -727,7 +727,7 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti // XView -Size SAL_CALL BaseControl::getSize() throw( RuntimeException ) +Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -738,7 +738,7 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException ) // XEventListener -void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException ) +void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -762,7 +762,7 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru // XPaintListener -void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException ) +void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -777,7 +777,7 @@ void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( Ru // XWindowListener -void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException ) +void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -794,7 +794,7 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run // XWindowListener -void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException ) +void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -811,7 +811,7 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti // XWindowListener -void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException ) +void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) { } @@ -819,7 +819,7 @@ void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( R // XWindowListener -void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException ) +void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) { } diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx index 0dd2bc41cfe5..ccee9bea5a13 100644 --- a/UnoControls/source/base/multiplexer.cxx +++ b/UnoControls/source/base/multiplexer.cxx @@ -96,7 +96,7 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper() // XInterface -Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException ) +Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -247,7 +247,7 @@ void OMRCListenerMultiplexerHelper::unadvise( const Type& // XEventListener -void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException ) +void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception ) { MutexGuard aGuard( m_aMutex ); // peer is disposed, clear the reference @@ -258,7 +258,7 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo // XFcousListener -void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent ) } @@ -267,7 +267,7 @@ void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw // XFcousListener -void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent ) } @@ -276,7 +276,7 @@ void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( // XWindowListener -void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent ) } @@ -285,7 +285,7 @@ void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) th // XWindowListener -void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent ) } @@ -294,7 +294,7 @@ void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) thro // XWindowListener -void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent ) } @@ -303,7 +303,7 @@ void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) thro // XWindowListener -void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent ) } @@ -312,7 +312,7 @@ void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) thr // XKeyListener -void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent ) } @@ -321,7 +321,7 @@ void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( Ru // XKeyListener -void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent ) } @@ -330,7 +330,7 @@ void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( R // XMouseListener -void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent ) } @@ -339,7 +339,7 @@ void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw // XMouseListener -void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent ) } @@ -348,7 +348,7 @@ void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) thro // XMouseListener -void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent ) } @@ -357,7 +357,7 @@ void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw // XMouseListener -void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent ) } @@ -366,7 +366,7 @@ void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( // XMouseMotionListener -void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent ) } @@ -375,7 +375,7 @@ void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw // XMouseMotionListener -void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent ) } @@ -384,7 +384,7 @@ void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( // XPaintListener -void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent ) } @@ -393,7 +393,7 @@ void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent ) } @@ -402,7 +402,7 @@ void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) thro // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent ) } @@ -411,7 +411,7 @@ void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) t // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent ) } @@ -420,7 +420,7 @@ void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) th // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent ) } @@ -429,7 +429,7 @@ void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent ) } @@ -438,7 +438,7 @@ void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent ) } @@ -447,7 +447,7 @@ void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException ) +void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException, std::exception ) { MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent ) } diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx index 48b69a5bf824..1266b4028f15 100644 --- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx @@ -51,7 +51,7 @@ OConnectionPointContainerHelper::~OConnectionPointContainerHelper() // XInterface -Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException ) +Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -102,7 +102,7 @@ void SAL_CALL OConnectionPointContainerHelper::release() throw() // XConnectionPointContainer -Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException ) +Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException, std::exception ) { // Container is threadsafe himself ! return m_aMultiTypeContainer.getContainedTypes(); @@ -112,7 +112,7 @@ Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTyp // XConnectionPointContainer -Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException ) +Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception ) { // Set default return value, if method failed. Reference< XConnectionPoint > xConnectionPoint; @@ -136,7 +136,7 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon void SAL_CALL OConnectionPointContainerHelper::advise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException ) + const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { // Container is threadsafe himself ! m_aMultiTypeContainer.addInterface( aType, xListener ); @@ -147,7 +147,7 @@ void SAL_CALL OConnectionPointContainerHelper::advise( const Type& void SAL_CALL OConnectionPointContainerHelper::unadvise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException ) + const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { // Container is threadsafe himself ! m_aMultiTypeContainer.removeInterface( aType, xListener ); diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx index c0d82b585b57..25036efd3c36 100644 --- a/UnoControls/source/controls/OConnectionPointHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointHelper.cxx @@ -56,7 +56,7 @@ OConnectionPointHelper::~OConnectionPointHelper() // XInterface -Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException ) +Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -107,7 +107,7 @@ void SAL_CALL OConnectionPointHelper::release() throw() // XConnectionPoint -Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException ) +Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -131,7 +131,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio // XConnectionPoint -Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException ) +Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -145,7 +145,7 @@ Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConne void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw( ListenerExistException , InvalidListenerException , - RuntimeException ) + RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -178,7 +178,7 @@ void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xLi // XConnectionPoint -void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException ) +void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -199,7 +199,7 @@ void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& x // XConnectionPoint -Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException ) +Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index b209983329aa..553571c17a6b 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -67,7 +67,7 @@ FrameControl::~FrameControl() // XInterface -Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException ) +Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -118,7 +118,7 @@ void SAL_CALL FrameControl::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException ) +Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -151,7 +151,7 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException ) // XAggregation -Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException ) +Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -180,7 +180,7 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToolkit , - const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException ) + const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException, std::exception ) { BaseControl::createPeer( xToolkit, xParentPeer ); if ( impl_getPeerWindow().is() ) @@ -196,7 +196,7 @@ void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToo // XControl -sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException ) +sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception ) { // We have no model. return sal_False ; @@ -206,7 +206,7 @@ sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xM // XControl -Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException ) +Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException, std::exception ) { // We have no model. return Reference< XControlModel >(); @@ -216,7 +216,7 @@ Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeExcep // XControl -void SAL_CALL FrameControl::dispose() throw( RuntimeException ) +void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception ) { impl_deleteFrame(); BaseControl::dispose(); @@ -226,7 +226,7 @@ void SAL_CALL FrameControl::dispose() throw( RuntimeException ) // XView -sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException ) +sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException, std::exception ) { // it is not possible to print this control return sal_False ; @@ -236,7 +236,7 @@ sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDe // XView -Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException ) +Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException, std::exception ) { // when its not posible to set graphics ! then its possible to return null return Reference< XGraphics >(); @@ -246,7 +246,7 @@ Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeExcept // XConnectionPointContainer -Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException ) +Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException, std::exception ) { // Forwarded to helper class return m_aConnectionPointContainer.getConnectionPointTypes(); @@ -256,7 +256,7 @@ Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( Runtime // XConnectionPointContainer -Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException ) +Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception ) { // Forwarded to helper class return m_aConnectionPointContainer.queryConnectionPoint( aType ); @@ -267,7 +267,7 @@ Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const void SAL_CALL FrameControl::advise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException ) + const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { // Forwarded to helper class m_aConnectionPointContainer.advise( aType, xListener ); @@ -278,7 +278,7 @@ void SAL_CALL FrameControl::advise( const Type& aType void SAL_CALL FrameControl::unadvise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException ) + const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) { // Forwarded to helper class m_aConnectionPointContainer.unadvise( aType, xListener ); @@ -342,7 +342,7 @@ sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedVa void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const Any& rValue ) - throw ( ::com::sun::star::uno::Exception ) + throw ( ::com::sun::star::uno::Exception, std::exception ) { // this method only set the value MutexGuard aGuard (m_aMutex) ; @@ -413,7 +413,7 @@ IPropertyArrayHelper& FrameControl::getInfoHelper() // OPropertySetHelper -Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( RuntimeException ) +Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( RuntimeException, std::exception ) { // 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 5f7d4233187e..654609156e66 100644 --- a/UnoControls/source/controls/progressbar.cxx +++ b/UnoControls/source/controls/progressbar.cxx @@ -63,7 +63,7 @@ ProgressBar::~ProgressBar() // XInterface -Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException ) +Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -114,7 +114,7 @@ void SAL_CALL ProgressBar::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException ) +Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -146,7 +146,7 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException ) // XAggregation -Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException ) +Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -170,7 +170,7 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx // XProgressBar -void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException ) +void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard (m_aMutex) ; @@ -186,7 +186,7 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( Runtime // XProgressBar -void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException ) +void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard (m_aMutex) ; @@ -202,7 +202,7 @@ void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( Runtim // XProgressBar -void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException ) +void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception ) { // This method is defined for follow things: // 1) Values >= _nMinRange @@ -233,7 +233,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 ) +void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception ) { // This method is defined for follow things: // 1) All values of sal_Int32 @@ -277,7 +277,7 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru // XProgressBar -sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException ) +sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard (m_aMutex) ; @@ -295,7 +295,7 @@ void SAL_CALL ProgressBar::setPosSize ( sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags -) throw( RuntimeException ) +) 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! @@ -317,7 +317,7 @@ void SAL_CALL ProgressBar::setPosSize ( // XControl -sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException ) +sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception ) { // A model is not possible for this control. return sal_False ; @@ -327,7 +327,7 @@ sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xMo // XControl -Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException ) +Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException, std::exception ) { // 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 68738ac98cad..3a19291abdc3 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 ) +Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // 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 ) +Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, std::exception ) { // 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 ) } // XAggregation -Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException ) +Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // 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 ) +) throw( RuntimeException, std::exception ) { // Safe impossible cases // Check valid call of this method. @@ -243,7 +243,7 @@ void SAL_CALL ProgressMonitor::addText( } // XProgressMonitor -void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException ) +void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException, std::exception ) { // Safe impossible cases // Check valid call of this method. @@ -286,7 +286,7 @@ void SAL_CALL ProgressMonitor::updateText ( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress -) throw( RuntimeException ) +) throw( RuntimeException, std::exception ) { // Safe impossible cases // Check valid call of this method. @@ -310,7 +310,7 @@ void SAL_CALL ProgressMonitor::updateText ( } // XProgressBar -void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException ) +void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -319,7 +319,7 @@ void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( Ru } // XProgressBar -void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException ) +void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -328,7 +328,7 @@ void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( Ru } // XProgressBar -void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException ) +void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -337,7 +337,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 ) +void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -346,7 +346,7 @@ void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw } // XProgressBar -sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException ) +sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -355,7 +355,7 @@ sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException ) } // XButton -void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException ) +void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -367,7 +367,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 ) +void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -379,7 +379,7 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< } // XButton -void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException ) +void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -391,7 +391,7 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim } // XButton -void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException ) +void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -403,13 +403,13 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr } // XLayoutConstrains -Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException ) +Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException, std::exception ) { return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT) ; } // XLayoutConstrains -Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException ) +Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std::exception ) { // Ready for multithreading ClearableMutexGuard aGuard ( m_aMutex ) ; @@ -453,13 +453,13 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException ) } // XLayoutConstrains -Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException ) +Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception ) { return getPreferredSize () ; } // XControl -void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent ) throw( RuntimeException ) +void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent ) throw( RuntimeException, std::exception ) { if (!getPeer().is()) { @@ -474,14 +474,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 ) +sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception ) { // We have no model. return sal_False ; } // XControl -css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException ) +css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException, std::exception ) { // We have no model. // return (XControlModel*)this ; @@ -489,7 +489,7 @@ css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw } // XComponent -void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException ) +void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -521,7 +521,7 @@ void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException ) } // XWindow -void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException ) +void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, 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/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx index 91d1b286d76f..e90b21a67bb9 100644 --- a/UnoControls/source/controls/statusindicator.cxx +++ b/UnoControls/source/controls/statusindicator.cxx @@ -73,7 +73,7 @@ StatusIndicator::~StatusIndicator() {} // XInterface -Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException ) +Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -124,7 +124,7 @@ void SAL_CALL StatusIndicator::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException ) +Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, std::exception ) { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -156,7 +156,7 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException ) // XAggregation -Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException ) +Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -180,7 +180,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 ) +void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -196,7 +196,7 @@ void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) // XStatusIndicator -void SAL_CALL StatusIndicator::end() throw( RuntimeException ) +void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -211,7 +211,7 @@ void SAL_CALL StatusIndicator::end() throw( RuntimeException ) // XStatusIndicator -void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException ) +void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -224,7 +224,7 @@ void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeEx // XStatusIndicator -void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException ) +void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -237,7 +237,7 @@ void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeExcept // XStatusIndicator -void SAL_CALL StatusIndicator::reset() throw( RuntimeException ) +void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -252,7 +252,7 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException ) // XLayoutConstrains -Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException ) +Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException, std::exception ) { return Size (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_DEFAULT_HEIGHT) ; } @@ -261,7 +261,7 @@ Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException ) // XLayoutConstrains -Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException ) +Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std::exception ) { // Ready for multithreading ClearableMutexGuard aGuard ( m_aMutex ) ; @@ -294,7 +294,7 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException ) // XLayoutConstrains -Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException ) +Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception ) { return getPreferredSize () ; } @@ -306,7 +306,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 ) +) throw( RuntimeException, std::exception ) { if( !getPeer().is() ) { @@ -324,7 +324,7 @@ void SAL_CALL StatusIndicator::createPeer ( // XControl -sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException ) +sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception ) { // We have no model. return sal_False ; @@ -334,7 +334,7 @@ sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XContro // XControl -css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException ) +css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException, std::exception ) { // We have no model. // return (XControlModel*)this ; @@ -345,7 +345,7 @@ css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw // XComponent -void SAL_CALL StatusIndicator::dispose () throw( RuntimeException ) +void SAL_CALL StatusIndicator::dispose () throw( RuntimeException, std::exception ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ) ; @@ -373,7 +373,7 @@ void SAL_CALL StatusIndicator::setPosSize ( sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags -) throw( RuntimeException ) +) 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 de2212a58801..3952af74f981 100644 --- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx @@ -97,7 +97,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -149,7 +149,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -166,7 +166,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -184,7 +184,7 @@ public: virtual void SAL_CALL advise( const ::com::sun::star::uno::Type& aType , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -202,7 +202,7 @@ public: virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Type& aType , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index e1687b48fb2d..b6c7789bfb85 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -101,7 +101,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -153,7 +153,7 @@ public: */ virtual ::com::sun::star::uno::Type SAL_CALL getConnectionType() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -169,7 +169,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -189,7 +189,7 @@ public: ) throw ( ::com::sun::star::lang::ListenerExistException, ::com::sun::star::lang::InvalidListenerException , - ::com::sun::star::uno::RuntimeException + ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @@ -206,7 +206,7 @@ public: */ virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -222,7 +222,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getConnections() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // private methods diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index b0bf03d2a802..a244e8b71423 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -81,7 +81,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -120,7 +120,7 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XAggregation @@ -128,7 +128,7 @@ public: ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XControl @@ -137,20 +137,20 @@ public: virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent - ) throw ( ::com::sun::star::uno::RuntimeException ); + ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XView @@ -158,31 +158,31 @@ public: virtual sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XConnectionPointContainer virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( const ::com::sun::star::uno::Type& aType - ) throw ( ::com::sun::star::uno::RuntimeException ); + ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL advise( const ::com::sun::star::uno::Type& aType , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Type& aType , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // impl but public methods to register service! @@ -212,7 +212,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const ::com::sun::star::uno::Any& rValue - ) throw ( ::com::sun::star::uno::Exception ); + ) throw ( ::com::sun::star::uno::Exception, std::exception ); virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue , sal_Int32 nHandle ) const ; @@ -224,7 +224,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // BaseControl diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx index cbe8a7e32d0a..15698fca9d47 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -106,7 +106,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -158,7 +158,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XAggregation @@ -178,7 +178,7 @@ public: */ ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XProgressBar @@ -198,7 +198,7 @@ public: */ virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -214,7 +214,7 @@ public: */ virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -229,7 +229,7 @@ public: @onerror */ - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -247,7 +247,7 @@ public: virtual void SAL_CALL setRange( sal_Int32 nMin , sal_Int32 nMax - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -262,7 +262,7 @@ public: @onerror */ - virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XWindow @@ -287,7 +287,7 @@ public: sal_Int32 nWidth , sal_Int32 nHeight , sal_Int16 nFlags - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XControl @@ -308,7 +308,7 @@ public: virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_________________________________________________________________________________________________________ @short @@ -324,7 +324,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // BaseControl diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index 6bbcd22c7842..0e2aede37a57 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -163,7 +163,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -214,7 +214,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XAggregation @@ -234,7 +234,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XProgressMonitor @@ -264,7 +264,7 @@ public: const OUString& sTopic , const OUString& sText , sal_Bool bbeforeProgress - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -282,7 +282,7 @@ public: virtual void SAL_CALL removeText( const OUString& sTopic , sal_Bool bbeforeProgress - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -301,7 +301,7 @@ public: const OUString& sTopic , const OUString& sText , sal_Bool bbeforeProgress - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XProgressBar @@ -320,7 +320,7 @@ public: @onerror - */ - virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -335,7 +335,7 @@ public: @onerror - */ - virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -350,7 +350,7 @@ public: @onerror - */ - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -366,7 +366,7 @@ public: */ virtual void SAL_CALL setRange( sal_Int32 nMin , - sal_Int32 nMax ) throw( ::com::sun::star::uno::RuntimeException ); + sal_Int32 nMax ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -381,7 +381,7 @@ public: @onerror - */ - virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XButton @@ -402,7 +402,7 @@ public: virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -419,7 +419,7 @@ public: virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -434,7 +434,7 @@ public: @onerror - */ - virtual void SAL_CALL setLabel( const OUString& sLabel ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setLabel( const OUString& sLabel ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -450,7 +450,7 @@ public: */ virtual void SAL_CALL setActionCommand( const OUString& sCommand ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XLayoutConstrains @@ -469,7 +469,7 @@ public: @onerror - */ - virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -484,7 +484,7 @@ public: @onerror - */ - virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -500,7 +500,7 @@ public: */ virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XControl @@ -522,7 +522,7 @@ public: virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -538,7 +538,7 @@ public: */ virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -554,7 +554,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XComponent @@ -573,7 +573,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XWindow @@ -596,7 +596,7 @@ public: sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); + sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // BaseControl diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx index 6dc51da763a4..df4dfdafc8d6 100644 --- a/UnoControls/source/inc/statusindicator.hxx +++ b/UnoControls/source/inc/statusindicator.hxx @@ -120,7 +120,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short increment refcount @@ -172,7 +172,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XAggregation @@ -192,7 +192,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains */ virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XStatusIndicator @@ -214,7 +214,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual void SAL_CALL start( const OUString& sText , sal_Int32 nRange - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /*-**************************************************************************************************** @short - @@ -229,7 +229,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL end() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL end() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /*-**************************************************************************************************** @short - @@ -244,7 +244,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL reset() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL reset() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /*-**************************************************************************************************** @short - @@ -259,7 +259,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL setText( const OUString& sText ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setText( const OUString& sText ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /*-**************************************************************************************************** @short - @@ -274,7 +274,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains @onerror - *//*-*****************************************************************************************************/ - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XLayoutConstrains @@ -293,7 +293,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains @onerror - */ - virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -308,7 +308,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains @onerror - */ - virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -324,7 +324,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains */ virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XControl @@ -346,7 +346,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent - ) throw( ::com::sun::star::uno::RuntimeException ); + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -362,7 +362,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains */ virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); /**_______________________________________________________________________________________________________ @short - @@ -378,7 +378,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XComponent @@ -397,7 +397,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains @onerror - */ - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XWindow @@ -420,7 +420,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException ); + sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); // BaseControl diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index 1efc2d83ed99..383ea23a4b69 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -66,14 +66,14 @@ protected: /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the specified child. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The role of this object (a table). */ // virtual sal_Int16 SAL_CALL getAccessibleRole() @@ -87,11 +87,11 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Grabs the focus to the BrowseBox. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The key bindings associated with this object. */ virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() @@ -103,7 +103,7 @@ protected: The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); public: // helper functions @@ -233,7 +233,7 @@ protected: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ); + SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // IAccessibleBrowseBox virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index 1246aaf371b3..82ad4398f058 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -119,23 +119,23 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The description of this object. */ virtual OUString SAL_CALL getAccessibleDescription() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The name of this object. */ virtual OUString SAL_CALL getAccessibleName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The relation set (the BrowseBox does not have one). @@ -143,24 +143,24 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The set of current states. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The parent's locale. */ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw ( ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported. */ virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /* Derived classes have to implement: - getAccessibleChildCount, @@ -174,25 +174,25 @@ public: /** @return , if the point lies within the bounding box of this object. */ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The bounding box of this object. */ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The upper left corner of the bounding box relative to the parent. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The upper left corner of the bounding box in screen coordinates. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The size of the bounding box. */ virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the object is showing. */ virtual sal_Bool SAL_CALL isShowing() @@ -206,13 +206,13 @@ public: virtual sal_Bool SAL_CALL isFocusTraversable() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XFocusListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); /* Derived classes have to implement: - getAccessibleAt, @@ -230,7 +230,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleEventBroadcaster -------------------------------------------- @@ -238,30 +238,30 @@ public: virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Removes an event listener. */ virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XTypeProvider ---------------------------------------------------------- /** @return An unique implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo ----------------------------------------------------------- /** @return Whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return A list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /* Derived classes have to implement: - getImplementationName. */ @@ -438,7 +438,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); private: BrowseBoxAccessibleElement(); // never implemented diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx index ee2d83607a3e..dfd1a4c650b6 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -60,20 +60,20 @@ namespace accessibility DECLARE_XTYPEPROVIDER( ) // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleValue - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // internal void SetChecked( sal_Bool _bChecked ); diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx index f90a97021424..7f8488f112ee 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -65,11 +65,11 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleComponent --------------------------------------------------- @@ -77,11 +77,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Grabs the focus to (the current cell of) the data table. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The key bindings associated with this object. */ virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() @@ -93,45 +93,45 @@ public: virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The description text of the specified column. */ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessibleTable interface of the row header bar. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessibleTable interface of the column header bar. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An index list of completely selected rows. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An index list of completely selected columns. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified row is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified column is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the cell object at the specified cell position. */ @@ -139,55 +139,55 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified cell is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (row or column of the table). */ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified child (row/column) is selected. */ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** Clears the complete selection. */ virtual void SAL_CALL clearAccessibleSelection() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Selects all children or first, if multiselection is not supported. */ virtual void SAL_CALL selectAllAccessibleChildren() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The number of selected rows/columns. */ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The specified selected row/column. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** Removes the specified row/column from the selection. */ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XInterface ------------------------------------------------------------- /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw (); @@ -199,11 +199,11 @@ public: /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An unique implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); protected: // internal virtual methods ----------------------------------------------- diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx index 378795ab9832..53d42ce56cd9 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -33,17 +33,17 @@ namespace accessibility const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType _eObjType); /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the specified child. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException ); + getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException, std::exception ); /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Grabs the focus to the BrowseBox. */ - virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); inline sal_Bool isRowBarCell() const { @@ -53,7 +53,7 @@ namespace accessibility /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx index 42a068458d5f..839ec65c9f8b 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTable.hxx @@ -52,11 +52,11 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleComponent --------------------------------------------------- @@ -64,11 +64,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Grabs the focus to (the current cell of) the data table. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The key bindings associated with this object. */ virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() @@ -79,44 +79,44 @@ public: /** @return The description text of the specified row. */ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The description text of the specified column. */ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessibleTable interface of the row header bar. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessibleTable interface of the column header bar. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An index list of completely selected rows. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An index list of completely selected columns. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified row is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified column is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the cell object at the specified cell position. */ @@ -124,18 +124,18 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified cell is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo ----------------------------------------------------------- /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); protected: // internal virtual methods ----------------------------------------------- diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx index 5da83b9c09d6..1adc5efd599e 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableBase.hxx @@ -65,11 +65,11 @@ public: /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The role of this object (a table). */ virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /* Derived classes have to implement: - getAccessibleChild, @@ -86,50 +86,50 @@ public: /** @return The number of used rows in the table (0 = empty table). */ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The number of used columns in the table (0 = empty table). */ virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The row extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The column extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The caption cell of the table (not supported). */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The summary object of the table (not supported). */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The child index of the specified cell. */ virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The row index of the specified child cell. */ virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The column index of the specified child cell. */ virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /* Derived classes have to implement: - getAccessibleRowDescription, @@ -148,7 +148,7 @@ public: /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw (); @@ -160,11 +160,11 @@ public: /** @return A sequence of possible types (received from base classes). */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An unique implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo ----------------------------------------------------------- diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx index 3fd4c86f0530..f72a98c56a33 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxTableCell.hxx @@ -58,7 +58,7 @@ namespace accessibility /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw (); @@ -69,23 +69,23 @@ namespace accessibility // XEventListener using AccessibleBrowseBoxBase::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the specified child. @@ -94,7 +94,7 @@ namespace accessibility ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. @@ -109,26 +109,26 @@ namespace accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; } #endif // ACCESSIBILITY_EXT_ACCESSIBILEBROWSEBOXTABLECELL_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index d3bcab1bd02d..b94f4ddfb25a 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -57,18 +57,18 @@ protected: /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the specified child. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The role of this object (a table). */ virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleComponent --------------------------------------------------- @@ -78,11 +78,11 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Grabs the focus to the Grid Control. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The key bindings associated with this object. */ virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() @@ -94,7 +94,7 @@ protected: The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); public: // helper functions @@ -219,7 +219,7 @@ protected: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ); + SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // IAccessibleTable virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index 9e8ed21d09ec..6d4a5d448f16 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -96,23 +96,23 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The description of this object. */ virtual OUString SAL_CALL getAccessibleDescription() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The name of this object. */ virtual OUString SAL_CALL getAccessibleName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The relation set (the GridControl does not have one). @@ -120,24 +120,24 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The set of current states. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The parent's locale. */ virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw ( ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported. */ virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /* Derived classes have to implement: - getAccessibleChildCount, @@ -151,25 +151,25 @@ public: /** @return , if the point lies within the bounding box of this object. */ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The bounding box of this object. */ virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The upper left corner of the bounding box relative to the parent. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The upper left corner of the bounding box in screen coordinates. */ virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The size of the bounding box. */ virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the object is showing. */ virtual sal_Bool SAL_CALL isShowing() @@ -183,8 +183,8 @@ public: virtual sal_Bool SAL_CALL isFocusTraversable() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); /* Derived classes have to implement: @@ -203,7 +203,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleEventBroadcaster -------------------------------------------- @@ -211,30 +211,30 @@ public: virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Removes an event listener. */ virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& rxListener ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XTypeProvider ---------------------------------------------------------- /** @return An unique implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo ----------------------------------------------------------- /** @return Whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return A list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /* Derived classes have to implement: - getImplementationName. */ @@ -367,7 +367,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); private: GridControlAccessibleElement(); // never implemented diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx index 98e9e94bd527..e11bf6d5d1af 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx @@ -59,11 +59,11 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleComponent --------------------------------------------------- @@ -71,11 +71,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Grabs the focus to (the current cell of) the data table. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The key bindings associated with this object. */ virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() @@ -87,45 +87,45 @@ public: virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The description text of the specified column. */ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessibleTable interface of the row header bar. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessibleTable interface of the column header bar. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An index list of completely selected rows. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An index list of completely selected columns. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified row is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified column is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the cell object at the specified cell position. */ @@ -133,22 +133,22 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified cell is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo ----------------------------------------------------------- /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An unique implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); protected: // internal virtual methods ----------------------------------------------- diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx index 14ca94741d6f..47ddf2420bff 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx @@ -32,24 +32,24 @@ namespace accessibility ::svt::table::IAccessibleTable& _rTable, ::svt::table::AccessibleTableControlObjType _eObjType); /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the specified child. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException ); + getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException,::com::sun::star::uno::RuntimeException, std::exception ); /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException ); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Grabs the focus to the GridControl. */ - virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XInterface /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw (); @@ -62,7 +62,7 @@ namespace accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); inline sal_Bool isRowBarCell() const { @@ -72,7 +72,7 @@ namespace accessibility /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx index f9994ea7ef31..63580f44ddc2 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx @@ -59,11 +59,11 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleComponent --------------------------------------------------- @@ -71,11 +71,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Grabs the focus to (the current cell of) the data table. */ virtual void SAL_CALL grabFocus() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The key bindings associated with this object. */ virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding() @@ -86,44 +86,44 @@ public: /** @return The description text of the specified row. */ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The description text of the specified column. */ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessibleTable interface of the row header bar. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessibleTable interface of the column header bar. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An index list of completely selected rows. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An index list of completely selected columns. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified row is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified column is completely selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the cell object at the specified cell position. */ @@ -131,54 +131,54 @@ public: ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified cell is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (row or column of the table). */ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return , if the specified child (row/column) is selected. */ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** Clears the complete selection. */ virtual void SAL_CALL clearAccessibleSelection() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Selects all children or first, if multiselection is not supported. */ virtual void SAL_CALL selectAllAccessibleChildren() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The number of selected rows/columns. */ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The specified selected row/column. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** Removes the specified row/column from the selection. */ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XInterface ------------------------------------------------------------- /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw (); @@ -189,7 +189,7 @@ public: /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /**@return m_pCellVector*/ std::vector< AccessibleGridControlTableCell* >& getCellVector(); diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx index 8eff13596520..2f97fda38a08 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx @@ -61,11 +61,11 @@ public: /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The role of this object (a table). */ virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /* Derived classes have to implement: - getAccessibleChild, @@ -82,50 +82,50 @@ public: /** @return The number of used rows in the table (0 = empty table). */ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The number of used columns in the table (0 = empty table). */ virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The row extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The column extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The caption cell of the table (not supported). */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The summary object of the table (not supported). */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The child index of the specified cell. */ virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The row index of the specified child cell. */ virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The column index of the specified child cell. */ virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /* Derived classes have to implement: - getAccessibleRowDescription, @@ -144,7 +144,7 @@ public: /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw (); @@ -156,11 +156,11 @@ public: /** @return A sequence of possible types (received from base classes). */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return An unique implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); protected: // internal helper methods ------------------------------------------------ diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx index a06758f66ea1..fc06e7930c07 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx @@ -38,7 +38,7 @@ namespace accessibility inline sal_Int32 getColumnPos( ) const { return m_nColPos; } // XAccessibleComponent - virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); protected: AccessibleGridControlCell( @@ -85,7 +85,7 @@ namespace accessibility /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw (); @@ -95,19 +95,19 @@ namespace accessibility /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The name of this class. */ virtual OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the specified child. @@ -116,7 +116,7 @@ namespace accessibility ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. @@ -131,26 +131,26 @@ namespace accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; } #endif // ACCESSIBILITY_EXT_ACCESSIBILEGRIDCONTROLTABLECELL_HXX diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx index 45af4bf22787..a23586f7797c 100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeck.hxx @@ -54,14 +54,14 @@ namespace accessibility virtual ~AccessibleToolPanelDeck(); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx index 406640a23bcd..3cf4a199bf72 100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBar.hxx @@ -56,13 +56,13 @@ namespace accessibility virtual ~AccessibleToolPanelTabBar(); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx index 77745c58fb48..ccc28745c1d2 100644 --- a/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx @@ -59,25 +59,25 @@ namespace accessibility public: // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // OCommonAccessibleComponent diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx index b00861464cb5..5cfb4cbb8ae3 100644 --- a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx +++ b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx @@ -50,7 +50,7 @@ namespace accessibility virtual Rectangle implGetBoundingBoxOnScreen(); // XAccessibleComponent - virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); protected: AccessibleBrowseBoxCell( diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx index ae0c811a6fb5..30800d3d172d 100644 --- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx @@ -53,11 +53,11 @@ namespace accessibility protected: // XAccessibleComponent - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) ; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XInterface DECLARE_XINTERFACE( ) @@ -65,24 +65,24 @@ namespace accessibility DECLARE_XTYPEPROVIDER( ) // XAccessibleContext - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getAccessibleRole() throw ( ::com::sun::star::uno::RuntimeException ); + sal_Int16 SAL_CALL getAccessibleRole() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // OComponentHelper virtual void SAL_CALL disposing(); // XComponent/OComponentProxyAggregationHelper (needs to be disambiguated) - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // OAccessibleContextWrapperHelper(); void notifyTranslatedEvent( const ::com::sun::star::accessibility::AccessibleEventObject& _rEvent ) throw (::com::sun::star::uno::RuntimeException); @@ -130,7 +130,7 @@ namespace accessibility virtual ~EditBrowseBoxTableCellAccess(); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent/OComponentHelper virtual void SAL_CALL disposing(); diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx index 155d69bef997..47389534d804 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrl.hxx @@ -73,34 +73,34 @@ namespace accessibility DECLARE_XINTERFACE() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static methods static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException); static OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx index b6047560132d..c33141011965 100644 --- a/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/accessibility/extended/accessibleiconchoicectrlentry.hxx @@ -112,75 +112,75 @@ namespace accessibility const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _xParent ); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static methods static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException); static OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx index 7ba06f97426e..b904b922657f 100644 --- a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx +++ b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx @@ -85,34 +85,34 @@ namespace accessibility DECLARE_XINTERFACE() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static methods static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException); static OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); private: diff --git a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx index e7824525d2cc..755065775ab7 100644 --- a/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/accessibility/extended/accessiblelistboxentry.hxx @@ -122,7 +122,7 @@ namespace accessibility virtual void SAL_CALL disposing(); // ListBoxAccessible/XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // OCommonAccessibleText virtual OUString implGetText(); @@ -147,85 +147,85 @@ namespace accessibility protected: // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static methods static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(com::sun::star::uno::RuntimeException); static OUString getImplementationName_Static(void) throw(com::sun::star::uno::RuntimeException); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > implGetParentAccessible( ) const; SvTreeListEntry* GetRealChild(sal_Int32 nIndex); diff --git a/accessibility/inc/accessibility/extended/accessibletabbar.hxx b/accessibility/inc/accessibility/extended/accessibletabbar.hxx index 7784ad5a421b..fbcf88f32ec2 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbar.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbar.hxx @@ -73,35 +73,35 @@ namespace accessibility DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx index ca42a6dd5ed9..0f0a289268a1 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpage.hxx @@ -90,35 +90,35 @@ namespace accessibility DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx index 89ab208a388a..08ef9a75be5f 100644 --- a/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/accessibility/extended/accessibletabbarpagelist.hxx @@ -85,44 +85,44 @@ namespace accessibility DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx index 5a600c370b03..d14d764844da 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistbox.hxx +++ b/accessibility/inc/accessibility/extended/accessibletablistbox.hxx @@ -63,17 +63,17 @@ public: /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); /** @return The XAccessible interface of the specified child. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XAccessibleContext - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // IAccessibleTabListBox virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > diff --git a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx index d369956c225f..1bbd01c69c4d 100644 --- a/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/accessibility/extended/accessibletablistboxtable.hxx @@ -94,16 +94,16 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/accessibility/extended/listboxaccessible.hxx index 11439ca83716..3d967744441f 100644 --- a/accessibility/inc/accessibility/extended/listboxaccessible.hxx +++ b/accessibility/inc/accessibility/extended/listboxaccessible.hxx @@ -66,7 +66,7 @@ namespace accessibility

Usually, you derive your class from both ListBoxAccessibleBase and XComponent, and call XComponent::dispose here.

*/ - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ) = 0; + virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; /// to be called in the dispose method of your derived class void disposing(); diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx index f527ba6ca8cf..0635e4fb7f0e 100644 --- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx @@ -169,199 +169,199 @@ protected: private: virtual css::uno::Reference< css::accessibility::XAccessibleContext > - SAL_CALL getAccessibleContext() throw (css::uno::RuntimeException); + SAL_CALL getAccessibleContext() throw (css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild(::sal_Int32 i) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() throw (css::uno::RuntimeException); + getAccessibleParent() throw (css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > - SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException); + SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (css::uno::RuntimeException); + getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception); virtual css::lang::Locale SAL_CALL getLocale() throw (css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL containsPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException); + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getAccessibleKeyBinding() throw (css::uno::RuntimeException); virtual css::util::Color SAL_CALL getForeground() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::util::Color SAL_CALL getBackground() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getCaretPosition() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::awt::Rectangle SAL_CALL getCharacterBounds(::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getCharacterCount() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getIndexAtPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getSelectedText() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getSelectionStart() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getSelectionEnd() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL setSelection(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getText() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTextRange(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL copyText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL cutText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL deleteText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL insertText(OUString const & rText, ::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL replaceText( ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, OUString const & rReplacement) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); 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); + css::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL setText(OUString const & rText) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); 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); + css::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addAccessibleEventListener( css::uno::Reference< css::accessibility::XAccessibleEventListener > const & rListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeAccessibleEventListener( css::uno::Reference< css::accessibility::XAccessibleEventListener > const & rListener) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL disposing(); @@ -556,19 +556,19 @@ public: private: virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild(::sal_Int32 i) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ); diff --git a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx index 5c9b434d381d..e6b1a7e78c13 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenubasecomponent.hxx @@ -136,13 +136,13 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX diff --git a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx index d7d0830cc98f..ba0e939fa651 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenucomponent.hxx @@ -57,35 +57,35 @@ public: DECLARE_XTYPEPROVIDER() // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX diff --git a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx index 8e6ff74dce8a..ea67095c536d 100644 --- a/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx +++ b/accessibility/inc/accessibility/standard/accessiblemenuitemcomponent.hxx @@ -64,26 +64,26 @@ public: virtual ~OAccessibleMenuItemComponent(); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx index 9e6cfa89daa0..ca2f5a320a79 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx @@ -64,7 +64,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext @@ -73,48 +73,48 @@ public: boxes. */ sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** For drop down list boxes the text field is a not editable VCLXAccessibleTextField, for combo boxes it is an editable VLCAccessibleEdit. */ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 i) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); /** The role is always AccessibleRole::COMBO_BOX. */ sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction /** There is one action for drop down boxes and none for others. */ virtual sal_Int32 SAL_CALL getAccessibleActionCount (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** 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 (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); /** The returned string is assoicated with resource RID_STR_ACC_ACTION_TOGGLEPOPUP. */ virtual OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); /** No keybinding returned so far. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XComponent @@ -126,17 +126,17 @@ public: //===== XAccessibleValue ================================================ virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); bool IsDropDownBox() {return m_bIsDropDownBox;}; BoxType GetBoxType() { return m_aBoxType;}; protected: diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx index cc8364cfc643..c5a22be25e88 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblebutton.hxx @@ -55,23 +55,23 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleValue - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEBUTTON_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx index 930b669515d1..a735fd02afc1 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblecheckbox.hxx @@ -65,20 +65,20 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleValue - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLECHECKBOX_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx index a3eacc46de23..d59a9c3e949d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblecombobox.hxx @@ -40,11 +40,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Return combo box specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual ~VCLXAccessibleComboBox (void); diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx index 1167df0eebff..ebc940cd1bf6 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdowncombobox.hxx @@ -42,11 +42,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Return drop down combo box specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual ~VCLXAccessibleDropDownComboBox (void); diff --git a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx index 2ea0d5204c8f..52c76f8bd02d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibledropdownlistbox.hxx @@ -41,11 +41,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Return drop down list box specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual ~VCLXAccessibleDropDownListBox (void); diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx index 58763ac9c09d..f43681cb3af4 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibleedit.hxx @@ -64,47 +64,47 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEditableText - virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aAttributeSet ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEEDIT_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx index 8ba0bb4b3990..fc3fd4c43b6d 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblefixedhyperlink.hxx @@ -38,8 +38,8 @@ public: VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLXindow ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx index b4a721c445c0..285ec9341d69 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblefixedtext.hxx @@ -38,8 +38,8 @@ public: VCLXAccessibleFixedText( VCLXWindow* pVCLXindow ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx index b3c3fc6898a6..d9fd0a50a71a 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelist.hxx @@ -90,25 +90,25 @@ public: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 i) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /** The index returned as index in parent is always the one set with the SetIndexInParent() method. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent virtual sal_Bool SAL_CALL contains (const ::com::sun::star::awt::Point& aPoint) @@ -120,22 +120,22 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Return list specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); sal_Bool IsInDropDown(); void HandleDropOpen(); virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList); diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx index c5a70dda0a46..9fc3d3b27a03 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistbox.hxx @@ -38,11 +38,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Return list box specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual ~VCLXAccessibleListBox (void); diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx index 1bd28d7ad864..7c49b53edd32 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblelistitem.hxx @@ -120,67 +120,67 @@ public: inline bool IncrementIndexInParent() { ++m_nIndexInParent; return true;} // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( ) throw(); virtual void SAL_CALL release( ) throw(); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground (void) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_ACCESSIBLELISTBOXENTRY_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx index 18a37c4405b5..82b2e85def2c 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenu.hxx @@ -51,28 +51,28 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENU_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx index 3b886eafae8c..26ac49b13dbc 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenubar.hxx @@ -50,15 +50,15 @@ public: virtual ~VCLXAccessibleMenuBar(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUBAR_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx index 0f38af5efcc8..b7122006f185 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuitem.hxx @@ -67,42 +67,42 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleValue - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEMENUITEM_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx index 2d4a755b60d8..0df32f586206 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblemenuseparator.hxx @@ -34,11 +34,11 @@ public: virtual ~VCLXAccessibleMenuSeparator(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx index eed22d9ad81e..ef9b0531ec41 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblepopupmenu.hxx @@ -37,15 +37,15 @@ public: virtual ~VCLXAccessiblePopupMenu(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx index 486312a75f7a..a1356739df64 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibleradiobutton.hxx @@ -56,20 +56,20 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleValue - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx index d0a91e44406a..fbf7ea00a756 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblescrollbar.hxx @@ -55,23 +55,23 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleValue - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + ::rtl::OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx index 0fa01585e76e..37e15ba3151f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbar.hxx @@ -56,15 +56,15 @@ public: ~VCLXAccessibleStatusBar(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx index 78b858b1d439..b17c8777c7e0 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessiblestatusbaritem.hxx @@ -90,44 +90,44 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx index 2a9398649838..b0c465004449 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabcontrol.hxx @@ -71,23 +71,23 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx index 3b0504f8db50..551acff8f414 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpage.hxx @@ -94,44 +94,44 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLETABPAGE_HXX diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx index 773aeac74354..eeef0ee6649a 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletabpagewindow.hxx @@ -50,8 +50,8 @@ public: ~VCLXAccessibleTabPageWindow(); // XAccessibleContext - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx index f4ef138d5cf9..f720f27a2aec 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletextcomponent.hxx @@ -61,23 +61,23 @@ public: DECLARE_XTYPEPROVIDER() // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx index 226fb01c8e2a..3a780780af09 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx @@ -53,27 +53,27 @@ public: // XAccessible ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 i) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); sal_Int16 SAL_CALL getAccessibleRole (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Return text field specific services. virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: virtual ~VCLXAccessibleTextField (void); diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx index da61c9cb26ad..d061adf77c8f 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolbox.hxx @@ -76,22 +76,22 @@ public: DECLARE_XTYPEPROVIDER( ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); private: void implReleaseToolboxItem( diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx index 6908edcbfdda..ae7441e194e1 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletoolboxitem.hxx @@ -99,56 +99,56 @@ public: DECLARE_XTYPEPROVIDER( ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCaretPosition() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::FontDescriptor SAL_CALL getFontMetrics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont >& xFont ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleValue - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; #endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 0cce02e4d684..2f28e8b443c3 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -116,7 +116,7 @@ void SAL_CALL AccessibleBrowseBox::disposing() // XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -127,7 +127,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() Reference< XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -156,7 +156,7 @@ AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) Reference< XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -187,7 +187,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) void SAL_CALL AccessibleBrowseBox::grabFocus() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -207,7 +207,7 @@ Any SAL_CALL AccessibleBrowseBox::getAccessibleKeyBinding() // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBox::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBox" ); } @@ -343,7 +343,7 @@ void AccessibleBrowseBoxAccess::dispose() } -Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() throw ( RuntimeException ) +Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() throw ( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 4a189380daf4..d228eda70c27 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -118,7 +118,7 @@ void SAL_CALL AccessibleBrowseBoxBase::disposing() // XAccessibleContext --------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleParent() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -126,7 +126,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleParent() } sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -162,7 +162,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent() } OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleDescription() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -170,7 +170,7 @@ OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleDescription() } OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -179,7 +179,7 @@ OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleName() Reference< XAccessibleRelationSet > SAL_CALL AccessibleBrowseBoxBase::getAccessibleRelationSet() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); // BrowseBox does not have relations. @@ -188,7 +188,7 @@ AccessibleBrowseBoxBase::getAccessibleRelationSet() Reference< XAccessibleStateSet > SAL_CALL AccessibleBrowseBoxBase::getAccessibleStateSet() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -197,7 +197,7 @@ AccessibleBrowseBoxBase::getAccessibleStateSet() } lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale() - throw ( IllegalAccessibleComponentStateException, uno::RuntimeException ) + throw ( IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -214,31 +214,31 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale() // XAccessibleComponent ------------------------------------------------------- sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } awt::Rectangle SAL_CALL AccessibleBrowseBoxBase::getBounds() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return AWTRectangle( getBoundingBox() ); } awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocation() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return AWTPoint( getBoundingBox().TopLeft() ); } awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocationOnScreen() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return AWTPoint( getBoundingBoxOnScreen().TopLeft() ); } awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return AWTSize( getBoundingBox().GetSize() ); } @@ -268,7 +268,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxBase::isFocusTraversable() xStateSet->contains( AccessibleStateType::FOCUSABLE ) : sal_False; } -void SAL_CALL AccessibleBrowseBoxBase::focusGained( const ::com::sun::star::awt::FocusEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AccessibleBrowseBoxBase::focusGained( const ::com::sun::star::awt::FocusEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Any aFocused; com::sun::star::uno::Any aEmpty; @@ -278,7 +278,7 @@ void SAL_CALL AccessibleBrowseBoxBase::focusGained( const ::com::sun::star::awt: } -void SAL_CALL AccessibleBrowseBoxBase::focusLost( const ::com::sun::star::awt::FocusEvent& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AccessibleBrowseBoxBase::focusLost( const ::com::sun::star::awt::FocusEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { com::sun::star::uno::Any aFocused; com::sun::star::uno::Any aEmpty; @@ -290,7 +290,7 @@ void SAL_CALL AccessibleBrowseBoxBase::focusLost( const ::com::sun::star::awt::F void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener( const Reference< XAccessibleEventListener>& _rxListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if ( _rxListener.is() ) { @@ -304,7 +304,7 @@ void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener( void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener>& _rxListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if( _rxListener.is() && getClientId( ) ) { @@ -332,7 +332,7 @@ namespace } Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return theAccessibleBrowseBoxBaseImplementationId::get().getSeq(); } @@ -341,13 +341,13 @@ Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId() sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService( const OUString& rServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL AccessibleBrowseBoxBase::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &aServiceName, 1 ); @@ -484,7 +484,7 @@ void AccessibleBrowseBoxBase::commitEvent( } sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); sal_Int16 nRole = AccessibleRole::UNKNOWN; @@ -521,17 +521,17 @@ Any SAL_CALL AccessibleBrowseBoxBase::getAccessibleKeyBinding() } Reference SAL_CALL AccessibleBrowseBoxBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return NULL; } -void SAL_CALL AccessibleBrowseBoxBase::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AccessibleBrowseBoxBase::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) { m_xFocusWindow = NULL; } -sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -557,7 +557,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun: return nColor; } -sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( ) throw (::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -584,7 +584,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( BrowseBoxAccessibleElement, AccessibleBrowseBo // XAccessible ---------------------------------------------------------------- -Reference< XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException ) +Reference< XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return this; diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index 966def8fa9d2..41b42aa05924 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) + Reference< XAccessibleContext > SAL_CALL AccessibleCheckBoxCell::getAccessibleContext( ) throw (RuntimeException, std::exception) { ensureIsAlive(); return this; @@ -66,7 +66,7 @@ namespace accessibility // XAccessibleValue - Any SAL_CALL AccessibleCheckBoxCell::getCurrentValue( ) throw (RuntimeException) + Any SAL_CALL AccessibleCheckBoxCell::getCurrentValue( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getOslMutex() ); @@ -86,12 +86,12 @@ namespace accessibility return makeAny(nValue); } - sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& ) throw (RuntimeException, std::exception) { return sal_False; } - Any SAL_CALL AccessibleCheckBoxCell::getMaximumValue( ) throw (RuntimeException) + Any SAL_CALL AccessibleCheckBoxCell::getMaximumValue( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( getOslMutex() ); @@ -105,7 +105,7 @@ namespace accessibility return aValue; } - Any SAL_CALL AccessibleCheckBoxCell::getMinimumValue( ) throw (RuntimeException) + Any SAL_CALL AccessibleCheckBoxCell::getMinimumValue( ) throw (RuntimeException, std::exception) { Any aValue; aValue <<= (sal_Int32) 0; @@ -114,23 +114,23 @@ namespace accessibility } // XAccessibleContext - sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return 0; } - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { throw ::com::sun::star::lang::IndexOutOfBoundsException(); } - OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) + OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.TableCheckBoxCell" ); } sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 21c532976d64..7a3814a04774 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -57,7 +57,7 @@ AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar() Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -67,7 +67,7 @@ AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex ) } sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return isRowBar() ? BBINDEX_ROWHEADERBAR : BBINDEX_COLUMNHEADERBAR; } @@ -76,7 +76,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent() Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -92,7 +92,7 @@ AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint ) } void SAL_CALL AccessibleBrowseBoxHeaderBar::grabFocus() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); // focus on header not supported @@ -108,7 +108,7 @@ Any SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleKeyBinding() // XAccessibleTable ----------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -118,7 +118,7 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal } OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -128,21 +128,21 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnDescription( } Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowHeaders() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return NULL; // no headers in headers } Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnHeaders() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return NULL; // no headers in headers } Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleRows() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -156,7 +156,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessib } Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleColumns() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -170,7 +170,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessib } sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -180,7 +180,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int } sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -191,7 +191,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -202,7 +202,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleCel sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -214,7 +214,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected( // XAccessibleSelection ------------------------------------------------------- void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -227,7 +227,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nCh } sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { // using interface methods - no mutex return isRowBar() ? @@ -236,7 +236,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_I } void SAL_CALL AccessibleBrowseBoxHeaderBar::clearAccessibleSelection() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -245,7 +245,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::clearAccessibleSelection() } void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -258,7 +258,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren() } sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -268,7 +268,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -281,7 +281,7 @@ AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChi void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -300,7 +300,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild( // XInterface ----------------------------------------------------------------- Any SAL_CALL AccessibleBrowseBoxHeaderBar::queryInterface( const uno::Type& rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { Any aAny( AccessibleBrowseBoxTableBase::queryInterface( rType ) ); return aAny.hasValue() ? @@ -320,7 +320,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::release() throw () // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderBar" ); } @@ -331,7 +331,7 @@ namespace } Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return theAccessibleBrowseBoxHeaderBarImplementationId::get().getSeq(); } diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 2a11f6b069ed..f8c32a56c7d6 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -81,7 +81,7 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR The count of visible children. */ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return 0; } @@ -91,7 +91,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount() The XAccessible interface of the specified child. */ Reference SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChild( sal_Int32 ) - throw ( IndexOutOfBoundsException,RuntimeException ) + throw ( IndexOutOfBoundsException,RuntimeException, std::exception ) { throw IndexOutOfBoundsException(); } @@ -99,7 +99,7 @@ Reference SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChi /** Grabs the focus to the column header. */ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -114,7 +114,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus() The name of this class. */ OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderCell" ); } @@ -148,7 +148,7 @@ Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen() } sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index 67f271e4b081..cc6b36bb0902 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -53,7 +53,7 @@ AccessibleBrowseBoxTable::~AccessibleBrowseBoxTable() Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -64,7 +64,7 @@ AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex ) } sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return BBINDEX_TABLE; @@ -74,7 +74,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent() Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -90,7 +90,7 @@ AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint ) } void SAL_CALL AccessibleBrowseBoxTable::grabFocus() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -108,7 +108,7 @@ Any SAL_CALL AccessibleBrowseBoxTable::getAccessibleKeyBinding() // XAccessibleTable ----------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -118,7 +118,7 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int } OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -128,7 +128,7 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnDescription( sal_ } Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowHeaders() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -136,7 +136,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleRo } Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnHeaders() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -144,7 +144,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCo } Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRows() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -156,7 +156,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRo } Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleColumns() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -168,7 +168,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleCo } sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleRowSelected( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -178,7 +178,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleRowSelected( sal_Int32 n } sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -189,7 +189,7 @@ 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 ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -200,7 +200,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCellAt( sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -212,7 +212,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleSelected( // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBoxTable::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxTable" ); } diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 916a1532c437..59136847ac9c 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -56,7 +56,7 @@ AccessibleBrowseBoxTableBase::~AccessibleBrowseBoxTableBase() // XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -65,7 +65,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount() } sal_Int16 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRole() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return AccessibleRole::TABLE; @@ -74,7 +74,7 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRole() // XAccessibleTable ----------------------------------------------------------- sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -83,7 +83,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowCount() } sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -93,7 +93,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnCount() sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -104,7 +104,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowExtentAt( sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -114,14 +114,14 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnExtentAt( } Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleCaption() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return NULL; // not supported } Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleSummary() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return NULL; // not supported @@ -129,7 +129,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleSum sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -139,7 +139,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex( } sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -149,7 +149,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nCh } sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -161,7 +161,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int32 // XInterface ----------------------------------------------------------------- Any SAL_CALL AccessibleBrowseBoxTableBase::queryInterface( const uno::Type& rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { Any aAny( BrowseBoxAccessibleElement::queryInterface( rType ) ); return aAny.hasValue() ? @@ -181,7 +181,7 @@ void SAL_CALL AccessibleBrowseBoxTableBase::release() throw () // XTypeProvider -------------------------------------------------------------- Sequence< uno::Type > SAL_CALL AccessibleBrowseBoxTableBase::getTypes() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return ::comphelper::concatSequences( BrowseBoxAccessibleElement::getTypes(), @@ -194,7 +194,7 @@ namespace } Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxTableBase::getImplementationId() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return theAccessibleBrowseBoxTableBaseImplementationId::get().getSeq(); } diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index a8eaa6be5879..df91fc3946a4 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -100,7 +100,7 @@ namespace accessibility /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL AccessibleBrowseBoxTableCell::queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { Any aRet = AccessibleBrowseBoxCell::queryInterface(rType); if ( !aRet.hasValue() ) @@ -120,7 +120,7 @@ namespace accessibility AccessibleBrowseBoxCell::release(); } - ::com::sun::star::awt::Rectangle SAL_CALL AccessibleBrowseBoxTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + ::com::sun::star::awt::Rectangle SAL_CALL AccessibleBrowseBoxTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -139,7 +139,7 @@ namespace accessibility return aRect; } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getIndexAtPoint( const ::com::sun::star::awt::Point& _aPoint ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getIndexAtPoint( const ::com::sun::star::awt::Point& _aPoint ) throw (RuntimeException, std::exception) { //! TODO CTL bidi // OSL_FAIL("Need to be done by base class!"); @@ -154,14 +154,14 @@ namespace accessibility The name of this class. */ OUString SAL_CALL AccessibleBrowseBoxTableCell::getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::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 ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return 0; } @@ -171,7 +171,7 @@ namespace accessibility ::com::sun::star::accessibility::XAccessible > SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleChild( sal_Int32 ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { throw ::com::sun::star::lang::IndexOutOfBoundsException(); } @@ -206,7 +206,7 @@ namespace accessibility // XAccessible ------------------------------------------------------------ /** @return The XAccessibleContext interface of this object. */ - Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleContext() throw ( RuntimeException ) + Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleContext() throw ( RuntimeException, std::exception ) { ensureIsAlive(); return this; @@ -215,7 +215,7 @@ namespace accessibility // XAccessibleContext ----------------------------------------------------- sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -224,11 +224,11 @@ namespace accessibility return /*BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos(); } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return -1; } - sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -238,13 +238,13 @@ namespace accessibility return sal_False; } - sal_Unicode SAL_CALL AccessibleBrowseBoxTableCell::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Unicode SAL_CALL AccessibleBrowseBoxTableCell::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getCharacter( nIndex ); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -256,32 +256,32 @@ namespace accessibility return ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >(); } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getCharacterCount( ); } - OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getSelectedText( ); } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getSelectionStart( ); } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getSelectionEnd( ); } - sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -290,37 +290,37 @@ namespace accessibility return sal_False; } - OUString SAL_CALL AccessibleBrowseBoxTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleBrowseBoxTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getText( ); } - OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType); } - sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -331,7 +331,7 @@ namespace accessibility //!!! don't know how to put a string into the clipboard return sal_False; } - void AccessibleBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException) + void AccessibleBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { if ( _rSource.Source == mxParent ) { diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index fb7d992edbdd..3fa3d9fed5f3 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -119,7 +119,7 @@ void SAL_CALL AccessibleGridControl::disposing() // XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); @@ -129,7 +129,7 @@ sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() Reference< XAccessible > SAL_CALL AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -173,7 +173,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -186,7 +186,7 @@ sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole() Reference< XAccessible > SAL_CALL AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); @@ -216,7 +216,7 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint ) void SAL_CALL AccessibleGridControl::grabFocus() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); @@ -237,7 +237,7 @@ Any SAL_CALL AccessibleGridControl::getAccessibleKeyBinding() // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleGridControl::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControl" ); } @@ -431,7 +431,7 @@ void AccessibleGridControlAccess::DisposeAccessImpl() } -Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() throw ( RuntimeException ) +Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() throw ( RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index ea1ba8fcb1fc..4187cf225a36 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -88,7 +88,7 @@ void SAL_CALL AccessibleGridControlBase::disposing() // XAccessibleContext --------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleParent() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -97,7 +97,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleParent } sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -133,7 +133,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent() } OUString SAL_CALL AccessibleGridControlBase::getAccessibleDescription() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -142,7 +142,7 @@ OUString SAL_CALL AccessibleGridControlBase::getAccessibleDescription() } OUString SAL_CALL AccessibleGridControlBase::getAccessibleName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -152,7 +152,7 @@ OUString SAL_CALL AccessibleGridControlBase::getAccessibleName() Reference< XAccessibleRelationSet > SAL_CALL AccessibleGridControlBase::getAccessibleRelationSet() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -163,7 +163,7 @@ AccessibleGridControlBase::getAccessibleRelationSet() Reference< XAccessibleStateSet > SAL_CALL AccessibleGridControlBase::getAccessibleStateSet() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -172,7 +172,7 @@ AccessibleGridControlBase::getAccessibleStateSet() } lang::Locale SAL_CALL AccessibleGridControlBase::getLocale() - throw ( IllegalAccessibleComponentStateException, uno::RuntimeException ) + throw ( IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -190,31 +190,31 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale() // XAccessibleComponent ------------------------------------------------------- sal_Bool SAL_CALL AccessibleGridControlBase::containsPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } awt::Rectangle SAL_CALL AccessibleGridControlBase::getBounds() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return AWTRectangle( getBoundingBox() ); } awt::Point SAL_CALL AccessibleGridControlBase::getLocation() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return AWTPoint( getBoundingBox().TopLeft() ); } awt::Point SAL_CALL AccessibleGridControlBase::getLocationOnScreen() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return AWTPoint( getBoundingBoxOnScreen().TopLeft() ); } awt::Size SAL_CALL AccessibleGridControlBase::getSize() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return AWTSize( getBoundingBox().GetSize() ); } @@ -247,7 +247,7 @@ sal_Bool SAL_CALL AccessibleGridControlBase::isFocusTraversable() void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener( const Reference< XAccessibleEventListener>& _rxListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if ( _rxListener.is() ) { @@ -262,7 +262,7 @@ void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener( void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener>& _rxListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if( _rxListener.is() && getClientId( ) ) { @@ -290,7 +290,7 @@ namespace } Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return theAccessibleGridControlBaseImplementationId::get().getSeq(); } @@ -299,13 +299,13 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId() sal_Bool SAL_CALL AccessibleGridControlBase::supportsService( const OUString& rServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &aServiceName, 1 ); @@ -408,7 +408,7 @@ void AccessibleGridControlBase::commitEvent( } sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); sal_Int16 nRole = AccessibleRole::UNKNOWN; @@ -442,12 +442,12 @@ Any SAL_CALL AccessibleGridControlBase::getAccessibleKeyBinding() } Reference SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return NULL; } -sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -472,7 +472,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::su return nColor; } -sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) throw (::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -505,7 +505,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridControlAccessibleElement, AccessibleGridCo // XAccessible ---------------------------------------------------------------- -Reference< XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException ) +Reference< XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 9929c0a5ee27..b4e635347f88 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -61,7 +61,7 @@ AccessibleGridControlHeader::~AccessibleGridControlHeader() Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -83,7 +83,7 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex ) } sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR && m_aTable.HasColHeader()) @@ -96,7 +96,7 @@ sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent() Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -112,7 +112,7 @@ AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint ) } void SAL_CALL AccessibleGridControlHeader::grabFocus() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); // focus on header not supported @@ -128,7 +128,7 @@ Any SAL_CALL AccessibleGridControlHeader::getAccessibleKeyBinding() // XAccessibleTable ----------------------------------------------------------- OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -138,7 +138,7 @@ OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_ } OUString SAL_CALL AccessibleGridControlHeader::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -148,7 +148,7 @@ OUString SAL_CALL AccessibleGridControlHeader::getAccessibleColumnDescription( s } Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibleRowHeaders() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -157,7 +157,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibl } Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibleColumnHeaders() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -166,27 +166,27 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibl } //not selectable Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleRows() - throw ( uno::RuntimeException ) + 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 ) + 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 ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { return sal_False; } //columns aren't selectable sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { (void)nColumn; return sal_False; @@ -194,14 +194,14 @@ 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 ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { return NULL; } // not selectable sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected( sal_Int32 /*nRow*/, sal_Int32 /*nColumn */) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { return sal_False; } @@ -209,7 +209,7 @@ sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected( // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleGridControlHeader::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControlHeader" ); } @@ -220,7 +220,7 @@ namespace } Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return theAccessibleGridControlHeaderImplementationId::get().getSeq(); } diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 8965d9d13346..ced105fc8acc 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -72,7 +72,7 @@ AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nCol The count of visible children. */ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { return 0; } @@ -82,7 +82,7 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount() The XAccessible interface of the specified child. */ Reference SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChild( sal_Int32 ) - throw ( IndexOutOfBoundsException,RuntimeException ) + throw ( IndexOutOfBoundsException,RuntimeException, std::exception ) { throw IndexOutOfBoundsException(); } @@ -91,7 +91,7 @@ Reference SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL AccessibleGridControlHeaderCell::queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { Any aRet = AccessibleGridControlCell::queryInterface(rType); return aRet; @@ -109,7 +109,7 @@ Reference SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC AccessibleGridControlCell::release(); } /** @return The XAccessibleContext interface of this object. */ - Reference< com::sun::star::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleContext() throw ( RuntimeException ) + Reference< com::sun::star::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleContext() throw ( RuntimeException, std::exception ) { ensureIsAlive(); return this; @@ -119,7 +119,7 @@ Reference SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC /** Grabs the focus to the column header. */ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { } @@ -127,7 +127,7 @@ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus() The name of this class. */ OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControlHeaderCell" ); } @@ -159,7 +159,7 @@ Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen() } sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 6c3a8f8a94e0..c9d5ace09253 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -55,7 +55,7 @@ AccessibleGridControlTable::~AccessibleGridControlTable() Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -77,7 +77,7 @@ AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex ) } sal_Int32 SAL_CALL AccessibleGridControlTable::getAccessibleIndexInParent() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); if(m_aTable.HasRowHeader() && m_aTable.HasColHeader()) @@ -92,7 +92,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTable::getAccessibleIndexInParent() Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -107,7 +107,7 @@ AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint ) } void SAL_CALL AccessibleGridControlTable::grabFocus() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -125,7 +125,7 @@ Any SAL_CALL AccessibleGridControlTable::getAccessibleKeyBinding() // XAccessibleTable ----------------------------------------------------------- OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -135,7 +135,7 @@ OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_I } OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -145,7 +145,7 @@ OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sa } Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessibleRowHeaders() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -157,7 +157,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessible } Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessibleColumnHeaders() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -166,7 +166,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessible } Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleRows() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -178,14 +178,14 @@ Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessible //columns aren't selectable Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleColumns() - throw ( uno::RuntimeException ) + 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 ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -206,7 +206,7 @@ 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 ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { (void) nColumn; return sal_False; @@ -214,7 +214,7 @@ 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 ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -238,7 +238,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleCellA sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -249,7 +249,7 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected( return isAccessibleRowSelected(nRow); } void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -260,7 +260,7 @@ 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 ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -271,7 +271,7 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int return isAccessibleRowSelected(nRow); } void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -279,7 +279,7 @@ void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection() m_aTable.SelectAllRows( false ); } void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -289,7 +289,7 @@ void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren() selectedRows[i]=i; } sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -300,7 +300,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount() } Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -313,7 +313,7 @@ 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 ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -323,7 +323,7 @@ void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild( // XInterface ----------------------------------------------------------------- Any SAL_CALL AccessibleGridControlTable::queryInterface( const uno::Type& rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { Any aAny( AccessibleGridControlTableBase::queryInterface( rType ) ); return aAny.hasValue() ? @@ -342,7 +342,7 @@ void SAL_CALL AccessibleGridControlTable::release() throw () // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleGridControlTable::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControlTable" ); } diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 61a1c4deecc5..6d2166cc1f59 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -55,7 +55,7 @@ AccessibleGridControlTableBase::~AccessibleGridControlTableBase() // XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -71,7 +71,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount() } sal_Int16 SAL_CALL AccessibleGridControlTableBase::getAccessibleRole() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -82,7 +82,7 @@ sal_Int16 SAL_CALL AccessibleGridControlTableBase::getAccessibleRole() // XAccessibleTable ----------------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -91,7 +91,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount() } sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -101,7 +101,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount() sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -112,7 +112,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowExtentAt( sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -122,7 +122,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnExtentAt( } Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleCaption() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -131,7 +131,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleC } Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleSummary() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -141,7 +141,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleS sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -151,7 +151,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex( } sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -161,7 +161,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 n } sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) + throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -173,7 +173,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int3 // XInterface ----------------------------------------------------------------- Any SAL_CALL AccessibleGridControlTableBase::queryInterface( const uno::Type& rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { Any aAny( GridControlAccessibleElement::queryInterface( rType ) ); return aAny.hasValue() ? @@ -193,7 +193,7 @@ void SAL_CALL AccessibleGridControlTableBase::release() throw () // XTypeProvider -------------------------------------------------------------- Sequence< uno::Type > SAL_CALL AccessibleGridControlTableBase::getTypes() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return ::comphelper::concatSequences( GridControlAccessibleElement::getTypes(), @@ -206,7 +206,7 @@ namespace } Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationId() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return theAccessibleGridControlTableBaseImplementationId::get().getSeq(); } diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 447ddfcafed0..08cfe0baf932 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -77,7 +77,7 @@ namespace accessibility } - void SAL_CALL AccessibleGridControlCell::grabFocus() throw ( RuntimeException ) + void SAL_CALL AccessibleGridControlCell::grabFocus() throw ( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -117,7 +117,7 @@ namespace accessibility /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL AccessibleGridControlTableCell::queryInterface( const ::com::sun::star::uno::Type& rType ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { Any aRet = AccessibleGridControlCell::queryInterface(rType); if ( !aRet.hasValue() ) @@ -137,7 +137,7 @@ namespace accessibility AccessibleGridControlCell::release(); } - ::com::sun::star::awt::Rectangle SAL_CALL AccessibleGridControlTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + ::com::sun::star::awt::Rectangle SAL_CALL AccessibleGridControlTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -152,7 +152,7 @@ namespace accessibility return aRect; } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const ::com::sun::star::awt::Point& _aPoint ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const ::com::sun::star::awt::Point& _aPoint ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -165,14 +165,14 @@ namespace accessibility The name of this class. */ OUString SAL_CALL AccessibleGridControlTableCell::getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControlTableCell" ); } /** @return The count of visible children. */ sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleChildCount() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return 0; } @@ -182,7 +182,7 @@ namespace accessibility ::com::sun::star::accessibility::XAccessible > SAL_CALL AccessibleGridControlTableCell::getAccessibleChild( sal_Int32 ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { throw ::com::sun::star::lang::IndexOutOfBoundsException(); } @@ -214,7 +214,7 @@ namespace accessibility // XAccessible ------------------------------------------------------------ /** @return The XAccessibleContext interface of this object. */ - Reference< XAccessibleContext > SAL_CALL AccessibleGridControlTableCell::getAccessibleContext() throw ( RuntimeException ) + Reference< XAccessibleContext > SAL_CALL AccessibleGridControlTableCell::getAccessibleContext() throw ( RuntimeException, std::exception ) { SolarMutexGuard g; @@ -225,7 +225,7 @@ namespace accessibility // XAccessibleContext ----------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleIndexInParent() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -234,11 +234,11 @@ namespace accessibility return ( getRowPos() * m_aTable.GetColumnCount() ) + getColumnPos(); } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return -1; } - sal_Bool SAL_CALL AccessibleGridControlTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleGridControlTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -247,13 +247,13 @@ namespace accessibility return sal_False; } - sal_Unicode SAL_CALL AccessibleGridControlTableCell::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Unicode SAL_CALL AccessibleGridControlTableCell::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getCharacter( nIndex ); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -264,32 +264,32 @@ namespace accessibility return ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >(); } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getCharacterCount( ); } - OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getSelectedText( ); } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getSelectionStart( ); } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getSelectionEnd( ); } - sal_Bool SAL_CALL AccessibleGridControlTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleGridControlTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -298,37 +298,37 @@ namespace accessibility return sal_False; } - OUString SAL_CALL AccessibleGridControlTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleGridControlTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getText( ); } - OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType); } - sal_Bool SAL_CALL AccessibleGridControlTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleGridControlTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index 7014211050fc..2df9cf0b0e51 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -237,7 +237,7 @@ namespace accessibility { } - sal_Int32 SAL_CALL AccessibleToolPanelDeck::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleToolPanelDeck::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); @@ -250,7 +250,7 @@ namespace accessibility return nChildCount; } - Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); @@ -270,7 +270,7 @@ namespace accessibility return m_pImpl->getActivePanelAccessible(); } - Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleParent( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); const Reference< XAccessible > xParent = implGetForeignControlledParent(); @@ -279,13 +279,13 @@ namespace accessibility return m_pImpl->m_xAccessibleParent; } - sal_Int16 SAL_CALL AccessibleToolPanelDeck::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 SAL_CALL AccessibleToolPanelDeck::getAccessibleRole( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); return AccessibleRole::PANEL; } - Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); @@ -322,7 +322,7 @@ namespace accessibility return NULL; } - void SAL_CALL AccessibleToolPanelDeck::grabFocus( ) throw (RuntimeException) + void SAL_CALL AccessibleToolPanelDeck::grabFocus( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); m_pImpl->m_pPanelDeck->GrabFocus(); diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 0253b577d6c8..1af4365c54ef 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -74,7 +74,7 @@ namespace accessibility } // XAccessible - virtual Reference< XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (RuntimeException) + virtual Reference< XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (RuntimeException, std::exception) { return m_xContext; } @@ -284,7 +284,7 @@ namespace accessibility { } - sal_Int32 SAL_CALL AccessibleToolPanelTabBar::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleToolPanelTabBar::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); @@ -296,7 +296,7 @@ namespace accessibility + ( bHasScrollForward ? 1 : 0 ); } - Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); @@ -323,13 +323,13 @@ namespace accessibility return m_pImpl->getAccessiblePanelItem( i_nIndex - ( bHasScrollBack ? 1 : 0 ) ); } - Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleParent( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); return m_pImpl->getAccessibleParent(); } - sal_Int16 SAL_CALL AccessibleToolPanelTabBar::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 SAL_CALL AccessibleToolPanelTabBar::getAccessibleRole( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); return AccessibleRole::PAGE_TAB_LIST; @@ -344,7 +344,7 @@ namespace accessibility } } - Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *m_pImpl ); diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index f5ef6d74ddcb..01cb1b30492d 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -247,48 +247,48 @@ namespace accessibility { } - sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { return 0; } - Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { (void)i; throw IndexOutOfBoundsException( OUString(), *this ); } - Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleParent( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getAccessibleParent(); } - sal_Int16 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRole( ) throw (RuntimeException, std::exception) { return AccessibleRole::PAGE_TAB; } - OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); } - OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); } - Reference< XAccessibleRelationSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRelationSet( ) throw (RuntimeException) + Reference< XAccessibleRelationSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); ::utl::AccessibleRelationSetHelper* pRelationSet = new utl::AccessibleRelationSetHelper; return pRelationSet; } - Reference< XAccessibleStateSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleStateSet( ) throw (RuntimeException) + Reference< XAccessibleStateSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); @@ -318,7 +318,7 @@ namespace accessibility return pStateSet; } - Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const UnoPoint& i_rLocation ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const UnoPoint& i_rLocation ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); // we do not have children ... @@ -326,27 +326,27 @@ namespace accessibility return NULL; } - void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus( ) throw (RuntimeException) + void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); m_pImpl->getTabBar()->FocusPanelItem( m_pImpl->getItemPos() ); } - ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getForeground( ) throw (RuntimeException) + ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getForeground( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW ); return xParentComponent->getForeground(); } - ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getBackground( ) throw (RuntimeException) + ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getBackground( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); Reference< XAccessibleComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_SET_THROW ); return xParentComponent->getBackground(); } - Reference< XFont > SAL_CALL AccessibleToolPanelDeckTabBarItem::getFont( ) throw (RuntimeException) + Reference< XFont > SAL_CALL AccessibleToolPanelDeckTabBarItem::getFont( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); Reference< XAccessibleExtendedComponent > xParentComponent( m_pImpl->getParentAccessibleComponent(), UNO_QUERY_THROW ); @@ -355,14 +355,14 @@ namespace accessibility return xParentComponent->getFont(); } - OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText( ) throw (RuntimeException) + OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); // no support return OUString(); } - OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText( ) throw (RuntimeException) + OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText( ) throw (RuntimeException, std::exception) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index 1056de2e988b..b139b6460b71 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx @@ -47,7 +47,7 @@ namespace accessibility { } - void SAL_CALL AccessibleBrowseBoxCell::grabFocus() throw ( RuntimeException ) + void SAL_CALL AccessibleBrowseBoxCell::grabFocus() throw ( RuntimeException, std::exception ) { SolarMethodGuard aGuard( *this ); mpBrowseBox->GoToCell( m_nRowPos, m_nColPos ); diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index c58ef312544c..a5957926d4a3 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -55,7 +55,7 @@ namespace accessibility } } - OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) + OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.TableCellProxy" ); } @@ -70,7 +70,7 @@ namespace accessibility } // XAccessibleComponent - sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground( ) throw (RuntimeException) + sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground( ) throw (RuntimeException, std::exception) { SolarMethodGuard aGuard( *this ); Reference< XAccessibleComponent > xAccComp( m_xInnerContext, UNO_QUERY ); @@ -79,7 +79,7 @@ namespace accessibility return 0; } - sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground( ) throw (RuntimeException) + sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground( ) throw (RuntimeException, std::exception) { SolarMethodGuard aGuard( *this ); Reference< XAccessibleComponent > xAccComp( m_xInnerContext, UNO_QUERY ); @@ -88,18 +88,18 @@ namespace accessibility return 0; } - Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent( ) throw (RuntimeException, std::exception) { return m_xParentAccessible; } - OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException ) + OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException, std::exception ) { SolarMethodGuard aGuard( *this ); return m_xInnerContext->getAccessibleDescription(); } - OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() throw ( RuntimeException ) + OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() throw ( RuntimeException, std::exception ) { SolarMethodGuard aGuard( *this ); @@ -107,38 +107,38 @@ namespace accessibility return "Column " + OUString::number(getColumnPos()-1) + ", Row " + OUString::number(getRowPos()); } - Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException ) + Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException, std::exception ) { SolarMethodGuard aGuard( *this ); return OAccessibleContextWrapperHelper::getAccessibleRelationSet( ); } - Reference SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException ) + Reference SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException, std::exception ) { SolarMethodGuard aGuard( *this ); return m_xInnerContext->getAccessibleStateSet(); // TODO: shouldn't we add an ACTIVE here? Isn't the EditBrowseBoxTableCell always ACTIVE? } - sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { SolarMethodGuard aGuard( *this ); return OAccessibleContextWrapperHelper::getAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMethodGuard aGuard( *this ); return OAccessibleContextWrapperHelper::getAccessibleChild( i ); } - sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole() throw ( RuntimeException ) + sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole() throw ( RuntimeException, std::exception ) { SolarMethodGuard aGuard( *this ); return m_xInnerContext->getAccessibleRole( ); } - void SAL_CALL EditBrowseBoxTableCell::dispose() throw( RuntimeException ) + void SAL_CALL EditBrowseBoxTableCell::dispose() throw( RuntimeException, std::exception ) { // simply disambiguate. Note that the OComponentHelper base in AccessibleBrowseBoxCell // will call our "disposing()", which will call "dispose()" on the OAccessibleContextWrapperHelper @@ -146,7 +146,7 @@ namespace accessibility AccessibleBrowseBoxCell::dispose(); } - void SAL_CALL EditBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException) + void SAL_CALL EditBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { AccessibleBrowseBoxCell::disposing( _rSource ); OAccessibleContextWrapperHelper::disposing( _rSource ); @@ -179,7 +179,7 @@ namespace accessibility { } - Reference< XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext( ) throw (RuntimeException) + Reference< XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext( ) throw (RuntimeException, std::exception) { if ( !m_pBrowseBox || !m_xControlAccessible.is() ) throw DisposedException(); diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 3fa17502dcb0..ff33395494d2 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -128,17 +128,17 @@ namespace accessibility // XServiceInfo - OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() throw (RuntimeException, std::exception) { return getImplementationName_Static(); } - Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() throw (RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } - sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -161,7 +161,7 @@ namespace accessibility // XAccessible - Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext( ) throw (RuntimeException) + Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext( ) throw (RuntimeException, std::exception) { ensureAlive(); return this; @@ -169,7 +169,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -177,7 +177,7 @@ namespace accessibility return getCtrl()->GetEntryCount(); } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, IndexOutOfBoundsException) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -190,7 +190,7 @@ namespace accessibility return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this ); } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleParent( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -198,13 +198,13 @@ namespace accessibility return m_xParent; } - sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole( ) throw (RuntimeException, std::exception) { //return AccessibleRole::TREE; return AccessibleRole::LIST; } - OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -212,7 +212,7 @@ namespace accessibility return getCtrl()->GetAccessibleDescription(); } - OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -226,7 +226,7 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -240,7 +240,7 @@ namespace accessibility pCtrl->SetCursor( pEntry ); } - sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -254,7 +254,7 @@ namespace accessibility return ( pCtrl->GetCursor() == pEntry ); } - void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection( ) throw (RuntimeException) + void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -262,7 +262,7 @@ namespace accessibility getCtrl()->SetNoSelection(); } - void SAL_CALL AccessibleIconChoiceCtrl::selectAllAccessibleChildren( ) throw (RuntimeException) + void SAL_CALL AccessibleIconChoiceCtrl::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -278,7 +278,7 @@ namespace accessibility } } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -297,7 +297,7 @@ namespace accessibility return nSelCount; } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -326,7 +326,7 @@ namespace accessibility return xChild; } - void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index bc4e92c1e089..c91b26f61e21 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -86,7 +86,7 @@ namespace accessibility } void AccessibleIconChoiceCtrlEntry::disposing( const EventObject& _rSource ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { if ( _rSource.Source == m_xParent ) { @@ -201,7 +201,7 @@ throw(RuntimeException) // XTypeProvider - Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId() throw (RuntimeException) + Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId() throw (RuntimeException, std::exception) { static ::cppu::OImplementationId* pId = NULL; @@ -242,17 +242,17 @@ throw(RuntimeException) // XServiceInfo - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() throw(RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() throw(RuntimeException, std::exception) { return getImplementationName_Static(); } - Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -275,7 +275,7 @@ throw(RuntimeException) // XAccessible - Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleContext( ) throw (RuntimeException) + Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleContext( ) throw (RuntimeException, std::exception) { EnsureIsAlive(); return this; @@ -283,17 +283,17 @@ throw(RuntimeException) // XAccessibleContext - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { return 0; // no children } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException,RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException,RuntimeException, std::exception) { throw IndexOutOfBoundsException(); } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleParent( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -301,26 +301,26 @@ throw(RuntimeException) return m_xParent; } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndex; } - sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole( ) throw (RuntimeException, std::exception) { //return AccessibleRole::LABEL; return AccessibleRole::LIST_ITEM; } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription( ) throw (RuntimeException, std::exception) { // no description for every item return OUString(); } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -328,12 +328,12 @@ throw(RuntimeException) return implGetText(); } - Reference< XAccessibleRelationSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRelationSet( ) throw (RuntimeException) + Reference< XAccessibleRelationSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { return new utl::AccessibleRelationSetHelper; } - Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet( ) throw (RuntimeException) + Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -362,7 +362,7 @@ throw(RuntimeException) return xStateSet; } - Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) + Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -372,42 +372,42 @@ throw(RuntimeException) // XAccessibleComponent - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) { return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) { return Reference< XAccessible >(); } - awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getBounds( ) throw (RuntimeException) + awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getBounds( ) throw (RuntimeException, std::exception) { return AWTRectangle( GetBoundingBox() ); } - awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocation( ) throw (RuntimeException) + awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocation( ) throw (RuntimeException, std::exception) { return AWTPoint( GetBoundingBox().TopLeft() ); } - awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen( ) throw (RuntimeException) + awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen( ) throw (RuntimeException, std::exception) { return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } - awt::Size SAL_CALL AccessibleIconChoiceCtrlEntry::getSize( ) throw (RuntimeException) + awt::Size SAL_CALL AccessibleIconChoiceCtrlEntry::getSize( ) throw (RuntimeException, std::exception) { return AWTSize( GetBoundingBox().GetSize() ); } - void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus( ) throw (RuntimeException) + void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus( ) throw (RuntimeException, std::exception) { // do nothing, because no focus for each item } - sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -424,7 +424,7 @@ throw(RuntimeException) return nColor; } - sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground( ) throw (RuntimeException) + sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -444,7 +444,7 @@ throw(RuntimeException) // XAccessibleText - awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -464,7 +464,7 @@ throw(RuntimeException) return aBounds; } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -493,7 +493,7 @@ throw(RuntimeException) return nIndex; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -511,7 +511,7 @@ throw(RuntimeException) // XAccessibleEventBroadcaster - void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) + void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { if (xListener.is()) { @@ -522,7 +522,7 @@ throw(RuntimeException) } } - void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) + void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { if (xListener.is()) { @@ -542,11 +542,11 @@ throw(RuntimeException) } } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return -1; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -557,14 +557,14 @@ throw(RuntimeException) return sal_False; } - sal_Unicode SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Unicode SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getCharacter( nIndex ); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -577,7 +577,7 @@ throw(RuntimeException) return ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >(); } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -585,28 +585,28 @@ throw(RuntimeException) return OCommonAccessibleText::getCharacterCount( ); } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectedText( ); } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionStart( ); } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionEnd( ); } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -617,35 +617,35 @@ throw(RuntimeException) return sal_False; } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getText( ); } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -657,7 +657,7 @@ throw(RuntimeException) // XAccessibleAction - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -665,7 +665,7 @@ throw(RuntimeException) return ACCESSIBLE_ACTION_COUNT; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -685,7 +685,7 @@ throw(RuntimeException) return bRet; } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -697,7 +697,7 @@ throw(RuntimeException) return sActionDesc; } - Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index d151bc27630c..dd849bf4e00a 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -323,17 +323,17 @@ namespace accessibility // XServiceInfo - OUString SAL_CALL AccessibleListBox::getImplementationName() throw(RuntimeException) + OUString SAL_CALL AccessibleListBox::getImplementationName() throw(RuntimeException, std::exception) { return getImplementationName_Static(); } - Sequence< OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } - sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -356,7 +356,7 @@ namespace accessibility // XAccessible - Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext( ) throw (RuntimeException) + Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext( ) throw (RuntimeException, std::exception) { ensureAlive(); return this; @@ -364,7 +364,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -378,7 +378,7 @@ namespace accessibility return nCount; } - Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -392,7 +392,7 @@ namespace accessibility return new AccessibleListBoxEntry( *getListBox(), pEntry, NULL ); } - Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -430,7 +430,7 @@ namespace accessibility } sal_Int16 SAL_CALL AccessibleListBox::getAccessibleRole() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -454,7 +454,7 @@ namespace accessibility return AccessibleRole::TREE; } - OUString SAL_CALL AccessibleListBox::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleListBox::getAccessibleDescription( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -462,7 +462,7 @@ namespace accessibility return getListBox()->GetAccessibleDescription(); } - OUString SAL_CALL AccessibleListBox::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleListBox::getAccessibleName( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -472,7 +472,7 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -485,7 +485,7 @@ namespace accessibility getListBox()->Select( pEntry, sal_True ); } - sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -498,7 +498,7 @@ namespace accessibility return getListBox()->IsSelected( pEntry ); } - void SAL_CALL AccessibleListBox::clearAccessibleSelection( ) throw (RuntimeException) + void SAL_CALL AccessibleListBox::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -513,7 +513,7 @@ namespace accessibility } } - void SAL_CALL AccessibleListBox::selectAllAccessibleChildren( ) throw (RuntimeException) + void SAL_CALL AccessibleListBox::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -528,7 +528,7 @@ namespace accessibility } } - sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -537,7 +537,7 @@ namespace accessibility return getListBox()->GetSelectionCount(); } - Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -567,7 +567,7 @@ namespace accessibility return xChild; } - void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 6a739d5e9abf..89fa4e939923 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -215,7 +215,7 @@ namespace accessibility // XTypeProvider - Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() throw (RuntimeException) + Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() throw (RuntimeException, std::exception) { static ::cppu::OImplementationId* pId = NULL; @@ -235,7 +235,7 @@ namespace accessibility // XComponent/ListBoxAccessibleBase - void SAL_CALL AccessibleListBoxEntry::dispose() throw ( uno::RuntimeException ) + void SAL_CALL AccessibleListBoxEntry::dispose() throw ( uno::RuntimeException, std::exception ) { AccessibleListBoxEntry_BASE::dispose(); } @@ -268,17 +268,17 @@ namespace accessibility // XServiceInfo - OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() throw(RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() throw(RuntimeException, std::exception) { return getImplementationName_Static(); } - Sequence< OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } - sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -301,7 +301,7 @@ namespace accessibility // XAccessible - Reference< XAccessibleContext > SAL_CALL AccessibleListBoxEntry::getAccessibleContext( ) throw (RuntimeException) + Reference< XAccessibleContext > SAL_CALL AccessibleListBoxEntry::getAccessibleContext( ) throw (RuntimeException, std::exception) { EnsureIsAlive(); return this; @@ -309,7 +309,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -323,7 +323,7 @@ namespace accessibility return nCount; } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -374,7 +374,7 @@ namespace accessibility } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -383,7 +383,7 @@ namespace accessibility return implGetParentAccessible( ); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -420,7 +420,7 @@ namespace accessibility return nCase; } - sal_Int16 SAL_CALL AccessibleListBoxEntry::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 SAL_CALL AccessibleListBoxEntry::getAccessibleRole( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -458,7 +458,7 @@ namespace accessibility return AccessibleRole::UNKNOWN; } - OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -493,7 +493,7 @@ namespace accessibility } } - OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -513,7 +513,7 @@ namespace accessibility return sRet; } - Reference< XAccessibleRelationSet > SAL_CALL AccessibleListBoxEntry::getAccessibleRelationSet( ) throw (RuntimeException) + Reference< XAccessibleRelationSet > SAL_CALL AccessibleListBoxEntry::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { Reference< XAccessibleRelationSet > xRelSet; Reference< XAccessible > xParent; @@ -531,7 +531,7 @@ namespace accessibility return xRelSet; } - Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet( ) throw (RuntimeException) + Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -568,7 +568,7 @@ namespace accessibility return xStateSet; } - Locale SAL_CALL AccessibleListBoxEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) + Locale SAL_CALL AccessibleListBoxEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -578,12 +578,12 @@ namespace accessibility // XAccessibleComponent - sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException) + sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) { return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -601,32 +601,32 @@ namespace accessibility return xAcc; } - awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds( ) throw (RuntimeException) + awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds( ) throw (RuntimeException, std::exception) { return AWTRectangle( GetBoundingBox() ); } - awt::Point SAL_CALL AccessibleListBoxEntry::getLocation( ) throw (RuntimeException) + awt::Point SAL_CALL AccessibleListBoxEntry::getLocation( ) throw (RuntimeException, std::exception) { return AWTPoint( GetBoundingBox().TopLeft() ); } - awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen( ) throw (RuntimeException) + awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen( ) throw (RuntimeException, std::exception) { return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } - awt::Size SAL_CALL AccessibleListBoxEntry::getSize( ) throw (RuntimeException) + awt::Size SAL_CALL AccessibleListBoxEntry::getSize( ) throw (RuntimeException, std::exception) { return AWTSize( GetBoundingBox().GetSize() ); } - void SAL_CALL AccessibleListBoxEntry::grabFocus( ) throw (RuntimeException) + void SAL_CALL AccessibleListBoxEntry::grabFocus( ) throw (RuntimeException, std::exception) { // do nothing, because no focus for each item } - sal_Int32 AccessibleListBoxEntry::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleListBoxEntry::getForeground( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -643,7 +643,7 @@ namespace accessibility return nColor; } - sal_Int32 AccessibleListBoxEntry::getBackground( ) throw (RuntimeException) + sal_Int32 AccessibleListBoxEntry::getBackground( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -663,7 +663,7 @@ namespace accessibility // XAccessibleText - awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -688,7 +688,7 @@ namespace accessibility return aBounds; } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -710,7 +710,7 @@ namespace accessibility return nIndex; } - sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -729,7 +729,7 @@ namespace accessibility // XAccessibleEventBroadcaster - void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) + void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { if (xListener.is()) { @@ -740,7 +740,7 @@ namespace accessibility } } - void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) + void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { if (xListener.is()) { @@ -763,7 +763,7 @@ namespace accessibility // XAccessibleAction - sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleActionCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -784,7 +784,7 @@ namespace accessibility return 0; } - sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -822,7 +822,7 @@ namespace accessibility return bRet; } - OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -862,7 +862,7 @@ namespace accessibility throw IndexOutOfBoundsException(); } - Reference< XAccessibleKeyBinding > AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessibleKeyBinding > AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -874,7 +874,7 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -888,7 +888,7 @@ namespace accessibility getListBox()->Select( pEntry, sal_True ); } - sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -903,7 +903,7 @@ namespace accessibility return getListBox()->IsSelected( pEntry ); } - void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection( ) throw (RuntimeException) + void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -922,7 +922,7 @@ namespace accessibility } } - void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren( ) throw (RuntimeException) + void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -941,7 +941,7 @@ namespace accessibility } } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -964,7 +964,7 @@ namespace accessibility return nSelCount; } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -997,7 +997,7 @@ namespace accessibility return xChild; } - void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1011,11 +1011,11 @@ namespace accessibility getListBox()->Select( pEntry, sal_False ); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return -1; } - sal_Bool SAL_CALL AccessibleListBoxEntry::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleListBoxEntry::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1026,14 +1026,14 @@ namespace accessibility return sal_False; } - sal_Unicode SAL_CALL AccessibleListBoxEntry::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Unicode SAL_CALL AccessibleListBoxEntry::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getCharacter( nIndex ); } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1046,7 +1046,7 @@ namespace accessibility return ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >(); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1054,28 +1054,28 @@ namespace accessibility return OCommonAccessibleText::getCharacterCount( ); } - OUString SAL_CALL AccessibleListBoxEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectedText( ); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionStart( ); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionEnd( ); } - sal_Bool SAL_CALL AccessibleListBoxEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + sal_Bool SAL_CALL AccessibleListBoxEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1086,35 +1086,35 @@ namespace accessibility return sal_False; } - OUString SAL_CALL AccessibleListBoxEntry::getText( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getText( ); } - OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } - ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1126,7 +1126,7 @@ namespace accessibility // XAccessibleValue - Any AccessibleListBoxEntry::getCurrentValue( ) throw (RuntimeException) + Any AccessibleListBoxEntry::getCurrentValue( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); Any aValue; @@ -1138,7 +1138,7 @@ namespace accessibility - sal_Bool AccessibleListBoxEntry::setCurrentValue( const Any& aNumber ) throw (RuntimeException) + sal_Bool AccessibleListBoxEntry::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1170,7 +1170,7 @@ namespace accessibility - Any AccessibleListBoxEntry::getMaximumValue( ) throw (RuntimeException) + Any AccessibleListBoxEntry::getMaximumValue( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1191,7 +1191,7 @@ namespace accessibility - Any AccessibleListBoxEntry::getMinimumValue( ) throw (RuntimeException) + Any AccessibleListBoxEntry::getMinimumValue( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index bea71f008f9b..d43f3f2ba8ac 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -192,21 +192,21 @@ namespace accessibility // XServiceInfo - OUString AccessibleTabBar::getImplementationName() throw (RuntimeException) + OUString AccessibleTabBar::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.svtools.AccessibleTabBar" ); } - sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName ) throw (RuntimeException) + sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleTabBar"; @@ -217,7 +217,7 @@ namespace accessibility // XAccessible - Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext( ) throw (RuntimeException) + Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -228,7 +228,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 AccessibleTabBar::getAccessibleChildCount() throw (RuntimeException) + sal_Int32 AccessibleTabBar::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -237,7 +237,7 @@ namespace accessibility - Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -272,7 +272,7 @@ namespace accessibility - Reference< XAccessible > AccessibleTabBar::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > AccessibleTabBar::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -289,7 +289,7 @@ namespace accessibility - sal_Int32 AccessibleTabBar::getAccessibleIndexInParent( ) throw (RuntimeException) + sal_Int32 AccessibleTabBar::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -316,7 +316,7 @@ namespace accessibility - sal_Int16 AccessibleTabBar::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 AccessibleTabBar::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -325,7 +325,7 @@ namespace accessibility - OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException) + OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -338,7 +338,7 @@ namespace accessibility - OUString AccessibleTabBar::getAccessibleName( ) throw (RuntimeException) + OUString AccessibleTabBar::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -351,7 +351,7 @@ namespace accessibility - Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet( ) throw (RuntimeException) + Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -362,7 +362,7 @@ namespace accessibility - Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet( ) throw (RuntimeException) + Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -383,7 +383,7 @@ namespace accessibility - Locale AccessibleTabBar::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) + Locale AccessibleTabBar::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -394,7 +394,7 @@ namespace accessibility // XAccessibleComponent - Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) + Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -423,7 +423,7 @@ namespace accessibility - void AccessibleTabBar::grabFocus( ) throw (RuntimeException) + void AccessibleTabBar::grabFocus( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -433,7 +433,7 @@ namespace accessibility - sal_Int32 AccessibleTabBar::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleTabBar::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -458,7 +458,7 @@ namespace accessibility - sal_Int32 AccessibleTabBar::getBackground( ) throw (RuntimeException) + sal_Int32 AccessibleTabBar::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -478,7 +478,7 @@ namespace accessibility // XAccessibleExtendedComponent - Reference< awt::XFont > AccessibleTabBar::getFont( ) throw (RuntimeException) + Reference< awt::XFont > AccessibleTabBar::getFont( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -504,7 +504,7 @@ namespace accessibility - OUString AccessibleTabBar::getTitledBorderText( ) throw (RuntimeException) + OUString AccessibleTabBar::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -517,7 +517,7 @@ namespace accessibility - OUString AccessibleTabBar::getToolTipText( ) throw (RuntimeException) + OUString AccessibleTabBar::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 7f6fb79b6785..15935d386632 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -249,21 +249,21 @@ namespace accessibility // XServiceInfo - OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException) + OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPage" ); } - sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName ) throw (RuntimeException) + sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleTabBarPage"; @@ -274,7 +274,7 @@ namespace accessibility // XAccessible - Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext( ) throw (RuntimeException) + Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -285,7 +285,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 AccessibleTabBarPage::getAccessibleChildCount() throw (RuntimeException) + sal_Int32 AccessibleTabBarPage::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -294,7 +294,7 @@ namespace accessibility - Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -306,7 +306,7 @@ namespace accessibility - Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -315,7 +315,7 @@ namespace accessibility - sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent( ) throw (RuntimeException) + sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -328,7 +328,7 @@ namespace accessibility - sal_Int16 AccessibleTabBarPage::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 AccessibleTabBarPage::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -337,7 +337,7 @@ namespace accessibility - OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException) + OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -350,7 +350,7 @@ namespace accessibility - OUString AccessibleTabBarPage::getAccessibleName( ) throw (RuntimeException) + OUString AccessibleTabBarPage::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -359,7 +359,7 @@ namespace accessibility - Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet( ) throw (RuntimeException) + Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -370,7 +370,7 @@ namespace accessibility - Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet( ) throw (RuntimeException) + Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -391,7 +391,7 @@ namespace accessibility - Locale AccessibleTabBarPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) + Locale AccessibleTabBarPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -402,7 +402,7 @@ namespace accessibility // XAccessibleComponent - Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) + Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -411,14 +411,14 @@ namespace accessibility - void AccessibleTabBarPage::grabFocus( ) throw (RuntimeException) + void AccessibleTabBarPage::grabFocus( ) throw (RuntimeException, std::exception) { // no focus } - sal_Int32 AccessibleTabBarPage::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleTabBarPage::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -436,7 +436,7 @@ namespace accessibility - sal_Int32 AccessibleTabBarPage::getBackground( ) throw (RuntimeException) + sal_Int32 AccessibleTabBarPage::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -456,7 +456,7 @@ namespace accessibility // XAccessibleExtendedComponent - Reference< awt::XFont > AccessibleTabBarPage::getFont( ) throw (RuntimeException) + Reference< awt::XFont > AccessibleTabBarPage::getFont( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -474,7 +474,7 @@ namespace accessibility - OUString AccessibleTabBarPage::getTitledBorderText( ) throw (RuntimeException) + OUString AccessibleTabBarPage::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -483,7 +483,7 @@ namespace accessibility - OUString AccessibleTabBarPage::getToolTipText( ) throw (RuntimeException) + OUString AccessibleTabBarPage::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 659df8b56a91..ba98af417284 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -412,21 +412,21 @@ namespace accessibility // XServiceInfo - OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException) + OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPageList" ); } - sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName ) throw (RuntimeException) + sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleTabBarPageList"; @@ -437,7 +437,7 @@ namespace accessibility // XAccessible - Reference< XAccessibleContext > AccessibleTabBarPageList::getAccessibleContext( ) throw (RuntimeException) + Reference< XAccessibleContext > AccessibleTabBarPageList::getAccessibleContext( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -448,7 +448,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount() throw (RuntimeException) + sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -457,7 +457,7 @@ namespace accessibility - Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -483,7 +483,7 @@ namespace accessibility - Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -496,7 +496,7 @@ namespace accessibility - sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent( ) throw (RuntimeException) + sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -505,7 +505,7 @@ namespace accessibility - sal_Int16 AccessibleTabBarPageList::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 AccessibleTabBarPageList::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -514,7 +514,7 @@ namespace accessibility - OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException) + OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -523,7 +523,7 @@ namespace accessibility - OUString AccessibleTabBarPageList::getAccessibleName( ) throw (RuntimeException) + OUString AccessibleTabBarPageList::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -532,7 +532,7 @@ namespace accessibility - Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet( ) throw (RuntimeException) + Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -543,7 +543,7 @@ namespace accessibility - Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet( ) throw (RuntimeException) + Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -564,7 +564,7 @@ namespace accessibility - Locale AccessibleTabBarPageList::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) + Locale AccessibleTabBarPageList::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -575,7 +575,7 @@ namespace accessibility // XAccessibleComponent - Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -604,14 +604,14 @@ namespace accessibility - void AccessibleTabBarPageList::grabFocus( ) throw (RuntimeException) + void AccessibleTabBarPageList::grabFocus( ) throw (RuntimeException, std::exception) { // no focus } - sal_Int32 AccessibleTabBarPageList::getForeground( ) throw (RuntimeException) + sal_Int32 AccessibleTabBarPageList::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -629,7 +629,7 @@ namespace accessibility - sal_Int32 AccessibleTabBarPageList::getBackground( ) throw (RuntimeException) + sal_Int32 AccessibleTabBarPageList::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -649,7 +649,7 @@ namespace accessibility // XAccessibleExtendedComponent - Reference< awt::XFont > AccessibleTabBarPageList::getFont( ) throw (RuntimeException) + Reference< awt::XFont > AccessibleTabBarPageList::getFont( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -667,7 +667,7 @@ namespace accessibility - OUString AccessibleTabBarPageList::getTitledBorderText( ) throw (RuntimeException) + OUString AccessibleTabBarPageList::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -676,7 +676,7 @@ namespace accessibility - OUString AccessibleTabBarPageList::getToolTipText( ) throw (RuntimeException) + OUString AccessibleTabBarPageList::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -687,7 +687,7 @@ namespace accessibility // XAccessibleSelection - void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -705,7 +705,7 @@ namespace accessibility - sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -721,14 +721,14 @@ namespace accessibility - void AccessibleTabBarPageList::clearAccessibleSelection( ) throw (RuntimeException) + void AccessibleTabBarPageList::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { // This method makes no sense in a TabBar, and so does nothing. } - void AccessibleTabBarPageList::selectAllAccessibleChildren( ) throw (RuntimeException) + void AccessibleTabBarPageList::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -737,7 +737,7 @@ namespace accessibility - sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -746,7 +746,7 @@ namespace accessibility - Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -769,7 +769,7 @@ namespace accessibility - void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index 1e16314aa0dd..f2ec2d8c9126 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -75,13 +75,13 @@ namespace accessibility // XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleTabListBox::getAccessibleChildCount() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return 2; // header and table } - Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext() throw ( RuntimeException ) + Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext() throw ( RuntimeException, std::exception ) { return this; } @@ -89,7 +89,7 @@ namespace accessibility Reference< XAccessible > SAL_CALL AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( IndexOutOfBoundsException, RuntimeException ) + throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index e87c8fd9ed4b..c3f594c54d43 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -321,14 +321,14 @@ namespace accessibility // XServiceInfo - OUString AccessibleTabListBoxTable::getImplementationName (void) throw (RuntimeException) + OUString AccessibleTabListBoxTable::getImplementationName (void) throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.svtools.AccessibleTabListBoxTable" ); } // XAccessibleSelection - void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -339,7 +339,7 @@ namespace accessibility implSelectRow( implGetRow( nChildIndex ), sal_True ); } - sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -350,7 +350,7 @@ namespace accessibility return implIsRowSelected( implGetRow( nChildIndex ) ); } - void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection( ) throw (RuntimeException) + void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -360,7 +360,7 @@ namespace accessibility m_pTabListBox->SetNoSelection(); } - void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren( ) throw (RuntimeException) + void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -370,7 +370,7 @@ namespace accessibility m_pTabListBox->SelectAll(); } - sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -380,7 +380,7 @@ namespace accessibility return implGetColumnCount() * implGetSelRowCount(); } - Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); @@ -396,7 +396,7 @@ namespace accessibility return getAccessibleCellAt( nRow, nColumn ); } - void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index a37effaebeab..235fa458531c 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -121,7 +121,7 @@ void ParagraphImpl::notifyEvent(::sal_Int16 nEventId, // virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL -ParagraphImpl::getAccessibleContext() throw (css::uno::RuntimeException) +ParagraphImpl::getAccessibleContext() throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return this; @@ -129,7 +129,7 @@ ParagraphImpl::getAccessibleContext() throw (css::uno::RuntimeException) // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getAccessibleChildCount() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return 0; @@ -139,7 +139,7 @@ ParagraphImpl::getAccessibleContext() throw (css::uno::RuntimeException) css::uno::Reference< css::accessibility::XAccessible > SAL_CALL ParagraphImpl::getAccessibleChild(::sal_Int32) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); throw css::lang::IndexOutOfBoundsException( @@ -151,7 +151,7 @@ ParagraphImpl::getAccessibleChild(::sal_Int32) // virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL ParagraphImpl::getAccessibleParent() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->getAccessible(); @@ -159,7 +159,7 @@ ParagraphImpl::getAccessibleParent() // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getAccessibleIndexInParent() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphIndex(this); @@ -167,7 +167,7 @@ ParagraphImpl::getAccessibleParent() // virtual ::sal_Int16 SAL_CALL ParagraphImpl::getAccessibleRole() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return css::accessibility::AccessibleRole::PARAGRAPH; @@ -175,7 +175,7 @@ ParagraphImpl::getAccessibleParent() // virtual OUString SAL_CALL ParagraphImpl::getAccessibleDescription() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OUString(); @@ -183,7 +183,7 @@ OUString SAL_CALL ParagraphImpl::getAccessibleDescription() // virtual OUString SAL_CALL ParagraphImpl::getAccessibleName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OUString(); @@ -192,7 +192,7 @@ OUString SAL_CALL ParagraphImpl::getAccessibleName() // virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL ParagraphImpl::getAccessibleRelationSet() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphRelationSet( this ); @@ -201,7 +201,7 @@ SAL_CALL ParagraphImpl::getAccessibleRelationSet() // virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL ParagraphImpl::getAccessibleStateSet() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -214,7 +214,7 @@ SAL_CALL ParagraphImpl::getAccessibleStateSet() // virtual css::lang::Locale SAL_CALL ParagraphImpl::getLocale() throw (css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveLocale(); @@ -222,7 +222,7 @@ css::lang::Locale SAL_CALL ParagraphImpl::getLocale() // virtual ::sal_Bool SAL_CALL ParagraphImpl::containsPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, @@ -234,7 +234,7 @@ css::lang::Locale SAL_CALL ParagraphImpl::getLocale() // virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL ParagraphImpl::getAccessibleAtPoint(css::awt::Point const &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return 0; @@ -242,7 +242,7 @@ ParagraphImpl::getAccessibleAtPoint(css::awt::Point const &) // virtual css::awt::Rectangle SAL_CALL ParagraphImpl::getBounds() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphBounds(this, false); @@ -250,7 +250,7 @@ css::awt::Rectangle SAL_CALL ParagraphImpl::getBounds() // virtual css::awt::Point SAL_CALL ParagraphImpl::getLocation() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, @@ -260,7 +260,7 @@ css::awt::Point SAL_CALL ParagraphImpl::getLocation() // virtual css::awt::Point SAL_CALL ParagraphImpl::getLocationOnScreen() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, @@ -270,7 +270,7 @@ css::awt::Point SAL_CALL ParagraphImpl::getLocationOnScreen() // virtual css::awt::Size SAL_CALL ParagraphImpl::getSize() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, @@ -279,7 +279,7 @@ css::awt::Size SAL_CALL ParagraphImpl::getSize() } // virtual -void SAL_CALL ParagraphImpl::grabFocus() throw (css::uno::RuntimeException) +void SAL_CALL ParagraphImpl::grabFocus() throw (css::uno::RuntimeException, std::exception) { checkDisposed(); Window* pWindow = m_xDocument->GetWindow(); @@ -311,21 +311,21 @@ css::uno::Any SAL_CALL ParagraphImpl::getAccessibleKeyBinding() // virtual css::util::Color SAL_CALL ParagraphImpl::getForeground() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return 0; // TODO } // virtual css::util::Color SAL_CALL ParagraphImpl::getBackground() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return 0; // TODO } // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getCaretPosition() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphCaretPosition(this); @@ -334,7 +334,7 @@ css::util::Color SAL_CALL ParagraphImpl::getBackground() // virtual ::sal_Bool SAL_CALL ParagraphImpl::setCaretPosition(::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphSelection(this, nIndex, nIndex); @@ -344,7 +344,7 @@ css::util::Color SAL_CALL ParagraphImpl::getBackground() // virtual ::sal_Unicode SAL_CALL ParagraphImpl::getCharacter(::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getCharacter(nIndex); @@ -354,7 +354,7 @@ css::util::Color SAL_CALL ParagraphImpl::getBackground() css::uno::Sequence< css::beans::PropertyValue > SAL_CALL ParagraphImpl::getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveCharacterAttributes( this, nIndex, aRequestedAttributes ); @@ -364,7 +364,7 @@ ParagraphImpl::getCharacterAttributes(::sal_Int32 nIndex, const ::com::sun::star css::awt::Rectangle SAL_CALL ParagraphImpl::getCharacterBounds(::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aBounds(m_xDocument->retrieveCharacterBounds(this, nIndex)); @@ -376,7 +376,7 @@ ParagraphImpl::getCharacterBounds(::sal_Int32 nIndex) // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getCharacterCount() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getCharacterCount(); @@ -385,7 +385,7 @@ ParagraphImpl::getCharacterBounds(::sal_Int32 nIndex) // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getIndexAtPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Point aPoint(rPoint); @@ -397,7 +397,7 @@ ParagraphImpl::getIndexAtPoint(css::awt::Point const & rPoint) // virtual OUString SAL_CALL ParagraphImpl::getSelectedText() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -406,7 +406,7 @@ OUString SAL_CALL ParagraphImpl::getSelectedText() // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getSelectionStart() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getSelectionStart(); @@ -414,7 +414,7 @@ OUString SAL_CALL ParagraphImpl::getSelectedText() // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getSelectionEnd() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getSelectionEnd(); @@ -424,7 +424,7 @@ OUString SAL_CALL ParagraphImpl::getSelectedText() ::sal_Bool SAL_CALL ParagraphImpl::setSelection(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphSelection(this, nStartIndex, nEndIndex); @@ -433,7 +433,7 @@ OUString SAL_CALL ParagraphImpl::getSelectedText() // virtual OUString SAL_CALL ParagraphImpl::getText() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getText(); @@ -443,28 +443,28 @@ OUString SAL_CALL ParagraphImpl::getText() OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex); } // virtual -::com::sun::star::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getTextAtIndex(nIndex, aTextType); } // virtual -::com::sun::star::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getTextBeforeIndex(nIndex, aTextType); } // virtual -::com::sun::star::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getTextBehindIndex(nIndex, aTextType); @@ -474,7 +474,7 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, ::sal_Bool SAL_CALL ParagraphImpl::copyText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->copyParagraphText(this, nStartIndex, nEndIndex); @@ -485,7 +485,7 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, ::sal_Bool SAL_CALL ParagraphImpl::cutText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, true, false, @@ -496,7 +496,7 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, // virtual ::sal_Bool SAL_CALL ParagraphImpl::pasteText(::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nIndex, nIndex, false, true, @@ -508,7 +508,7 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, ::sal_Bool SAL_CALL ParagraphImpl::deleteText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false, @@ -520,7 +520,7 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, ::sal_Bool SAL_CALL ParagraphImpl::insertText(OUString const & rText, ::sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nIndex, nIndex, false, false, rText); @@ -532,7 +532,7 @@ OUString SAL_CALL ParagraphImpl::getTextRange(::sal_Int32 nStartIndex, ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, OUString const & rReplacement) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false, @@ -545,7 +545,7 @@ ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, css::uno::Sequence< css::beans::PropertyValue > const & rAttributeSet) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphAttributes(this, nStartIndex, nEndIndex, @@ -555,7 +555,7 @@ ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, // virtual ::sal_Bool SAL_CALL ParagraphImpl::setText(OUString const & rText) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, rText); @@ -565,7 +565,7 @@ ParagraphImpl::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, // virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL ParagraphImpl::getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveDefaultAttributes( this, RequestedAttributes ); @@ -575,7 +575,7 @@ ParagraphImpl::getDefaultAttributes(const css::uno::Sequence< OUString >& Reques css::uno::Sequence< css::beans::PropertyValue > SAL_CALL ParagraphImpl::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveRunAttributes( this, Index, RequestedAttributes ); @@ -584,7 +584,7 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUS // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getLineNumberAtIndex( ::sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -597,7 +597,7 @@ ParagraphImpl::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUS // virtual css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineNumber( ::sal_Int32 nLineNo ) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -610,7 +610,7 @@ css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineNumber( ::s // virtual css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret( ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -630,7 +630,7 @@ css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret( // virtual ::sal_Int32 SAL_CALL ParagraphImpl::getNumberOfLineWithCaret( ) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphLineWithCursor(this); @@ -641,7 +641,7 @@ css::accessibility::TextSegment SAL_CALL ParagraphImpl::getTextAtLineWithCaret( void SAL_CALL ParagraphImpl::addAccessibleEventListener( css::uno::Reference< css::accessibility::XAccessibleEventListener > const & rListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { if (rListener.is()) { @@ -665,7 +665,7 @@ void SAL_CALL ParagraphImpl::addAccessibleEventListener( void SAL_CALL ParagraphImpl::removeAccessibleEventListener( css::uno::Reference< css::accessibility::XAccessibleEventListener > const & rListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { comphelper::AccessibleEventNotifier::TClientId nId = 0; { @@ -1504,7 +1504,7 @@ Document::retrieveParagraphRelationSet( ParagraphImpl const * pParagraph ) // virtual ::sal_Int32 SAL_CALL Document::getAccessibleChildCount() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard(this); init(); @@ -1515,7 +1515,7 @@ Document::retrieveParagraphRelationSet( ParagraphImpl const * pParagraph ) css::uno::Reference< css::accessibility::XAccessible > SAL_CALL Document::getAccessibleChild(::sal_Int32 i) throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard(this); init(); @@ -1530,7 +1530,7 @@ Document::getAccessibleChild(::sal_Int32 i) // virtual ::sal_Int16 SAL_CALL Document::getAccessibleRole() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return css::accessibility::AccessibleRole::TEXT_FRAME; } @@ -1538,7 +1538,7 @@ 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) + 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 20783a889125..4fff31c5f5c4 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -727,7 +727,7 @@ void OAccessibleMenuBaseComponent::disposing() // XServiceInfo -sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rServiceName ) throw (RuntimeException) +sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } @@ -736,7 +736,7 @@ sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rService // XAccessible -Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleContext( ) throw (RuntimeException) +Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleContext( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -747,7 +747,7 @@ Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleConte // XAccessibleContext -Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStateSet( ) throw (RuntimeException) +Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 2edd76c018fb..43b388c73162 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -154,7 +154,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, OAccessibleMenuBaseC // XAccessibleContext -sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -163,7 +163,7 @@ sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeExce -Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -175,7 +175,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 -Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -197,7 +197,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw -sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -206,7 +206,7 @@ sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeExceptio -OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException) +OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -223,7 +223,7 @@ OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeExc -OUString OAccessibleMenuComponent::getAccessibleName( ) throw (RuntimeException) +OUString OAccessibleMenuComponent::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -232,7 +232,7 @@ OUString OAccessibleMenuComponent::getAccessibleName( ) throw (RuntimeException -Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -243,7 +243,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelat -Locale OAccessibleMenuComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) +Locale OAccessibleMenuComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -254,7 +254,7 @@ Locale OAccessibleMenuComponent::getLocale( ) throw (IllegalAccessibleComponent // XAccessibleComponent -Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) +Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -263,7 +263,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const a -awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeException) +awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -284,7 +284,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeExcep -void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException) +void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -298,7 +298,7 @@ void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException) -sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException) +sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -310,7 +310,7 @@ sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException) -sal_Int32 OAccessibleMenuComponent::getBackground( ) throw (RuntimeException) +sal_Int32 OAccessibleMenuComponent::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -321,7 +321,7 @@ sal_Int32 OAccessibleMenuComponent::getBackground( ) throw (RuntimeException) // XAccessibleExtendedComponent -Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeException) +Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -348,7 +348,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeExce -OUString OAccessibleMenuComponent::getTitledBorderText( ) throw (RuntimeException) +OUString OAccessibleMenuComponent::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -357,7 +357,7 @@ OUString OAccessibleMenuComponent::getTitledBorderText( ) throw (RuntimeExcepti -OUString OAccessibleMenuComponent::getToolTipText( ) throw (RuntimeException) +OUString OAccessibleMenuComponent::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -368,7 +368,7 @@ OUString OAccessibleMenuComponent::getToolTipText( ) throw (RuntimeException) // XAccessibleSelection -void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -380,7 +380,7 @@ void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) th -sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -392,7 +392,7 @@ sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIn -void OAccessibleMenuComponent::clearAccessibleSelection( ) throw (RuntimeException) +void OAccessibleMenuComponent::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -401,14 +401,14 @@ void OAccessibleMenuComponent::clearAccessibleSelection( ) throw (RuntimeExcept -void OAccessibleMenuComponent::selectAllAccessibleChildren( ) throw (RuntimeException) +void OAccessibleMenuComponent::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { // This method makes no sense in a menu, and so does nothing. } -sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -425,7 +425,7 @@ sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (R -Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -448,7 +448,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s -void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 6a3fea7ad38e..19cbe7aaf778 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -307,7 +307,7 @@ void SAL_CALL OAccessibleMenuItemComponent::disposing() // XAccessibleContext -sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -316,7 +316,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (Runtime -Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -328,7 +328,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_I -Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -337,7 +337,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) t -sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -346,7 +346,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) throw (Ru -sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -355,7 +355,7 @@ sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeExce -OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException) +OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -368,7 +368,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (Runtim -OUString OAccessibleMenuItemComponent::getAccessibleName( ) throw (RuntimeException) +OUString OAccessibleMenuItemComponent::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -377,7 +377,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleName( ) throw (RuntimeExcep -Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -388,7 +388,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleR -Locale OAccessibleMenuItemComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) +Locale OAccessibleMenuItemComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -399,7 +399,7 @@ Locale OAccessibleMenuItemComponent::getLocale( ) throw (IllegalAccessibleCompo // XAccessibleComponent -Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) +Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -408,14 +408,14 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( con -void OAccessibleMenuItemComponent::grabFocus( ) throw (RuntimeException) +void OAccessibleMenuItemComponent::grabFocus( ) throw (RuntimeException, std::exception) { // no focus for items } -sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeException) +sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -433,7 +433,7 @@ sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeExceptio -sal_Int32 OAccessibleMenuItemComponent::getBackground( ) throw (RuntimeException) +sal_Int32 OAccessibleMenuItemComponent::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -453,7 +453,7 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground( ) throw (RuntimeExceptio // XAccessibleExtendedComponent -Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (RuntimeException) +Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -471,7 +471,7 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (Runtime -OUString OAccessibleMenuItemComponent::getTitledBorderText( ) throw (RuntimeException) +OUString OAccessibleMenuItemComponent::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -480,7 +480,7 @@ OUString OAccessibleMenuItemComponent::getTitledBorderText( ) throw (RuntimeExc -OUString OAccessibleMenuItemComponent::getToolTipText( ) throw (RuntimeException) +OUString OAccessibleMenuItemComponent::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 7509c981329e..898a8c9c7c91 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -295,7 +295,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleBox, VCLXAccessibleComponent, VCL //===== XAccessible ========================================================= Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -305,7 +305,7 @@ Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -329,7 +329,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount (void) } Reference SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 i) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -378,7 +378,7 @@ Reference SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 return xChild; } -sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole (void) throw (RuntimeException) +sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole (void) throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -393,7 +393,7 @@ sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole (void) throw (RuntimeExc } sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT) return m_nIndexInParent; @@ -404,7 +404,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent (void) //===== XAccessibleAction =================================================== sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex> aGuard (GetMutex()); @@ -414,7 +414,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount (void) } sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { sal_Bool bNotify = sal_False; @@ -456,7 +456,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) } OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 nIndex) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if (nIndex<0 || nIndex>=getAccessibleActionCount()) @@ -469,7 +469,7 @@ OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 n } Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -491,7 +491,7 @@ void SAL_CALL VCLXAccessibleBox::disposing (void) // ===== XAccessibleValue =============================================== Any VCLXAccessibleBox::getCurrentValue( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -528,7 +528,7 @@ Any VCLXAccessibleBox::getCurrentValue( ) } sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& aNumber ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -544,14 +544,14 @@ sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& aNumber ) } Any VCLXAccessibleBox::getMaximumValue( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aAny; return aAny; } Any VCLXAccessibleBox::getMinimumValue( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aAny; return aAny; diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index a4d0e2fde6c3..63267f9f70a7 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -124,14 +124,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextCompon // XServiceInfo -OUString VCLXAccessibleButton::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleButton::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleButton" ); } -Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleButton"; @@ -142,7 +142,7 @@ Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (Run // XAccessibleContext -OUString VCLXAccessibleButton::getAccessibleName( ) throw (RuntimeException) +OUString VCLXAccessibleButton::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -180,7 +180,7 @@ OUString VCLXAccessibleButton::getAccessibleName( ) throw (RuntimeException) // XAccessibleAction -sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -189,7 +189,7 @@ sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeExcept -sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -205,7 +205,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (In -OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -217,7 +217,7 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex -Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -258,7 +258,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB // XAccessibleValue -Any VCLXAccessibleButton::getCurrentValue( ) throw (RuntimeException) +Any VCLXAccessibleButton::getCurrentValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -273,7 +273,7 @@ Any VCLXAccessibleButton::getCurrentValue( ) throw (RuntimeException) -sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException) +sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -299,7 +299,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt -Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException) +Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -311,7 +311,7 @@ Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException) -Any VCLXAccessibleButton::getMinimumValue( ) throw (RuntimeException) +Any VCLXAccessibleButton::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index eaa7cc6e8f5c..6780d6810361 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -164,14 +164,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComp // XServiceInfo -OUString VCLXAccessibleCheckBox::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleCheckBox::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleCheckBox" ); } -Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleCheckBox"; @@ -182,7 +182,7 @@ Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (R // XAccessibleAction -sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -191,7 +191,7 @@ sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeExce -sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -223,7 +223,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw ( -OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -238,7 +238,7 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd -Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -279,7 +279,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe // XAccessibleValue -Any VCLXAccessibleCheckBox::getCurrentValue( ) throw (RuntimeException) +Any VCLXAccessibleCheckBox::getCurrentValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -294,7 +294,7 @@ Any VCLXAccessibleCheckBox::getCurrentValue( ) throw (RuntimeException) -sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (RuntimeException) +sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -322,7 +322,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru -Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException) +Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -339,7 +339,7 @@ Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException) -Any VCLXAccessibleCheckBox::getMinimumValue( ) throw (RuntimeException) +Any VCLXAccessibleCheckBox::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index 8c8fcf36d72e..db8d0593723f 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -66,7 +66,7 @@ void VCLXAccessibleComboBox::ProcessWindowEvent (const VclWindowEvent& rVclWindo //===== XServiceInfo ======================================================== OUString VCLXAccessibleComboBox::getImplementationName (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleComboBox" ); } @@ -75,7 +75,7 @@ OUString VCLXAccessibleComboBox::getImplementationName (void) Sequence< OUString > VCLXAccessibleComboBox::getSupportedServiceNames (void) - throw (RuntimeException) + 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 63e4241e7597..f9557ef04da2 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -89,7 +89,7 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r //===== XServiceInfo ======================================================== OUString VCLXAccessibleDropDownComboBox::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleDropDownComboBox" ); } @@ -98,7 +98,7 @@ OUString VCLXAccessibleDropDownComboBox::getImplementationName() Sequence< OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames (void) - throw (RuntimeException) + 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 cd5c507cefa2..bfff68edb824 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -79,7 +79,7 @@ void VCLXAccessibleDropDownListBox::ProcessWindowEvent( const VclWindowEvent& rV //===== XServiceInfo ======================================================== OUString VCLXAccessibleDropDownListBox::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleDropDownListBox" ); } @@ -88,7 +88,7 @@ OUString VCLXAccessibleDropDownListBox::getImplementationName() Sequence< OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames (void) - throw (RuntimeException) + 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 be40d5c43d1d..b51f09eee22d 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -181,14 +181,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, VCLXAccessibleTextComponen // XServiceInfo -OUString VCLXAccessibleEdit::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleEdit::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleEdit" ); } -Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleEdit"; @@ -199,7 +199,7 @@ Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (Runti // XAccessibleContext -sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -208,7 +208,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException) -Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -220,7 +220,7 @@ Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) t -sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -238,7 +238,7 @@ sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) throw (RuntimeException) // XAccessibleAction -sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -248,7 +248,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeExceptio -sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -268,7 +268,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde -OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -281,7 +281,7 @@ OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) -Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -295,21 +295,21 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBin // XAccessibleText -sal_Int32 VCLXAccessibleEdit::getCaretPosition( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleEdit::getCaretPosition( ) throw (RuntimeException, std::exception) { return getSelectionEnd(); } -sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return setSelection( nIndex, nIndex ); } -sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -318,7 +318,7 @@ sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOut -Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) +Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -327,7 +327,7 @@ Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 -awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -370,7 +370,7 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw -sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -379,7 +379,7 @@ sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) throw (RuntimeException) -sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) +sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -388,7 +388,7 @@ sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw -OUString VCLXAccessibleEdit::getSelectedText( ) throw (RuntimeException) +OUString VCLXAccessibleEdit::getSelectedText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -397,7 +397,7 @@ OUString VCLXAccessibleEdit::getSelectedText( ) throw (RuntimeException) -sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -406,7 +406,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) throw (RuntimeException) -sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -415,7 +415,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) throw (RuntimeException) -sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -438,7 +438,7 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd -OUString VCLXAccessibleEdit::getText( ) throw (RuntimeException) +OUString VCLXAccessibleEdit::getText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -447,7 +447,7 @@ OUString VCLXAccessibleEdit::getText( ) throw (RuntimeException) -OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -456,7 +456,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd -::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -465,7 +465,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd -::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -474,7 +474,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd -::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -483,7 +483,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd -sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -494,7 +494,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) +sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -503,7 +503,7 @@ sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex -sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -537,7 +537,7 @@ sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoun -sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -546,7 +546,7 @@ sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIn -sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -555,7 +555,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) +sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -582,7 +582,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) +sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const Sequence& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -594,7 +594,7 @@ sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEn -sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeException) +sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx index 05035338b9cf..39e9791ba300 100644 --- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx @@ -55,14 +55,14 @@ void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundar // XServiceInfo -OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw (uno::RuntimeException) +OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleFixedHyperlink" ); } -uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleFixedHyperlink"; diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx index e5c64f31596b..e79718577bbd 100644 --- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx @@ -67,14 +67,14 @@ void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sa // XServiceInfo -OUString VCLXAccessibleFixedText::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleFixedText::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleFixedText" ); } -Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleFixedText"; diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 91a44409be9e..75fec91622a5 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -572,7 +572,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent, VC Reference SAL_CALL VCLXAccessibleList::getAccessibleContext (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return this; } @@ -581,7 +581,7 @@ Reference SAL_CALL //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -595,7 +595,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount (void) Reference SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int32 i) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -619,7 +619,7 @@ Reference SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int3 Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -628,7 +628,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT) return m_nIndexInParent; @@ -638,7 +638,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void) sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return AccessibleRole::LIST; } @@ -696,14 +696,14 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt //===== XServiceInfo ========================================================== OUString VCLXAccessibleList::getImplementationName (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleList" ); } Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); @@ -847,7 +847,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) // XAccessibleSelection -void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { sal_Bool bNotify = sal_False; @@ -872,7 +872,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) UpdateSelection_Impl(); } -sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -887,7 +887,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil return bRet; } -void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeException) +void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { sal_Bool bNotify = sal_False; @@ -906,7 +906,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeExc UpdateSelection_Impl(); } -void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (RuntimeException) +void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { sal_Bool bNotify = sal_False; @@ -931,7 +931,7 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (Runtime UpdateSelection_Impl(); } -sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -942,7 +942,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) throw return nCount; } -Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -956,7 +956,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild return NULL; } -void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { sal_Bool bNotify = sal_False; @@ -1011,7 +1011,7 @@ awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException) } -awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeException) +awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 1ee48a81fac0..701e0ba3d895 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -77,7 +77,7 @@ void VCLXAccessibleListBox::ProcessWindowEvent (const VclWindowEvent& rVclWindow //===== XServiceInfo ======================================================== OUString VCLXAccessibleListBox::getImplementationName (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleListBox" ); } @@ -86,7 +86,7 @@ OUString VCLXAccessibleListBox::getImplementationName (void) Sequence< OUString > VCLXAccessibleListBox::getSupportedServiceNames (void) - throw (RuntimeException) + 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 b1e4c6dce484..f829093a2652 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -146,7 +146,7 @@ void VCLXAccessibleListItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32 // XInterface -Any SAL_CALL VCLXAccessibleListItem::queryInterface( Type const & rType ) throw (RuntimeException) +Any SAL_CALL VCLXAccessibleListItem::queryInterface( Type const & rType ) throw (RuntimeException, std::exception) { return VCLXAccessibleListItem_BASE::queryInterface( rType ); } @@ -163,12 +163,12 @@ void SAL_CALL VCLXAccessibleListItem::release() throw () // XTypeProvider -Sequence< Type > SAL_CALL VCLXAccessibleListItem::getTypes( ) throw (RuntimeException) +Sequence< Type > SAL_CALL VCLXAccessibleListItem::getTypes( ) throw (RuntimeException, std::exception) { return VCLXAccessibleListItem_BASE::getTypes(); } -Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (RuntimeException) +Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (RuntimeException, std::exception) { static ::cppu::OImplementationId* pId = NULL; @@ -213,17 +213,17 @@ void SAL_CALL VCLXAccessibleListItem::disposing() // XServiceInfo -OUString VCLXAccessibleListItem::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleListItem::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleListItem" ); } -sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName ) throw (RuntimeException) +sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(3); aNames[0] = "com.sun.star.accessibility.AccessibleContext"; @@ -234,49 +234,49 @@ Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (R // XAccessible -Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleContext( ) throw (RuntimeException) +Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleContext( ) throw (RuntimeException, std::exception) { return this; } // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { return 0; } -Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 ) throw (RuntimeException) +Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 ) throw (RuntimeException, std::exception) { return Reference< XAccessible >(); } -Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_xParent; } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndexInParent; } -sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole( ) throw (RuntimeException, std::exception) { return AccessibleRole::LIST_ITEM; // return AccessibleRole::LABEL; } -OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription( ) throw (RuntimeException) +OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription( ) throw (RuntimeException, std::exception) { // no description for every item return OUString(); } -OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName( ) throw (RuntimeException) +OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -284,14 +284,14 @@ OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName( ) throw (RuntimeEx return implGetText(); } -Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleListItem::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleListItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; Reference< XAccessibleRelationSet > xSet = pRelationSetHelper; return xSet; } -Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleStateSet( ) throw (RuntimeException) +Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -323,7 +323,7 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleS return xStateSet; } -Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) +Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -333,7 +333,7 @@ Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw (IllegalAccessibleCo // XAccessibleComponent -sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint ) throw (RuntimeException) +sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -348,12 +348,12 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi return bInside; } -Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) +Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) { return Reference< XAccessible >(); } -awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeException) +awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -365,7 +365,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeExce return aRect; } -awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeException) +awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -379,7 +379,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeExcept return AWTPoint( aPoint ); } -awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (RuntimeException) +awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -394,7 +394,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (Runti return AWTPoint( aPoint ); } -awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) throw (RuntimeException) +awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -406,19 +406,19 @@ awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) throw (RuntimeException) return AWTSize( aSize ); } -void SAL_CALL VCLXAccessibleListItem::grabFocus( ) throw (RuntimeException) +void SAL_CALL VCLXAccessibleListItem::grabFocus( ) throw (RuntimeException, std::exception) { // no focus for each item } // XAccessibleText -sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition() throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition() throw (RuntimeException, std::exception) { return -1; } -sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -429,7 +429,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) t return sal_False; } -sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -437,7 +437,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) +Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -449,7 +449,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttribute return Sequence< PropertyValue >(); } -awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -470,7 +470,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI return aBounds; } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -478,7 +478,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeExc return OCommonAccessibleText::getCharacterCount(); } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -497,7 +497,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP return nIndex; } -OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeException) +OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -505,7 +505,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeExcept return OCommonAccessibleText::getSelectedText(); } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -513,7 +513,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeExc return OCommonAccessibleText::getSelectionStart(); } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -521,7 +521,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) +sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -532,7 +532,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s return sal_False; } -OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException) +OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -540,7 +540,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException) return OCommonAccessibleText::getText(); } -OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -548,7 +548,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } -::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -556,7 +556,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); } -::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -564,7 +564,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); } -::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -572,7 +572,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); } -sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -605,7 +605,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I // XAccessibleEventBroadcaster -void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) +void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { if (xListener.is()) { @@ -615,7 +615,7 @@ void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Referenc } } -void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) +void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) { if ( xListener.is() && m_nClientId ) { @@ -643,7 +643,7 @@ 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 (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return COL_BLACK; } @@ -652,7 +652,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground (void) // initial implementation and has to be substituted by code that determines // the color that is actually used. sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground (void) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return COL_WHITE; } diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index 8dba21b894f4..95d0a9550c24 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -89,14 +89,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VC // XServiceInfo -OUString VCLXAccessibleMenu::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleMenu::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleMenu" ); } -Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleMenu"; @@ -107,7 +107,7 @@ Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (Runti // XAccessibleContext -sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -116,7 +116,7 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) throw (RuntimeExceptio -Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -128,7 +128,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) t -sal_Int16 VCLXAccessibleMenu::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 VCLXAccessibleMenu::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -139,7 +139,7 @@ sal_Int16 VCLXAccessibleMenu::getAccessibleRole( ) throw (RuntimeException) // XAccessibleComponent -Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) +Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -150,7 +150,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Po // XAccessibleSelection -void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -162,7 +162,7 @@ void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (I -sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -174,7 +174,7 @@ sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) -void VCLXAccessibleMenu::clearAccessibleSelection( ) throw (RuntimeException) +void VCLXAccessibleMenu::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -183,14 +183,14 @@ void VCLXAccessibleMenu::clearAccessibleSelection( ) throw (RuntimeException) -void VCLXAccessibleMenu::selectAllAccessibleChildren( ) throw (RuntimeException) +void VCLXAccessibleMenu::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { // This method makes no sense in a menu, and so does nothing. } -sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -207,7 +207,7 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (Runtime -Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -230,7 +230,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int -void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -242,7 +242,7 @@ void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw -OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index 3ba4c19eb30c..a72b60d9b5ec 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -134,14 +134,14 @@ void VCLXAccessibleMenuBar::disposing() // XServiceInfo -OUString VCLXAccessibleMenuBar::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleMenuBar::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleMenuBar" ); } -Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleMenuBar"; @@ -152,7 +152,7 @@ Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (Ru // XAccessibleContext -sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -184,7 +184,7 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeEx -sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -195,7 +195,7 @@ sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole( ) throw (RuntimeException) // XAccessibleExtendedComponent -sal_Int32 VCLXAccessibleMenuBar::getBackground( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleMenuBar::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index 488befd799e4..2cb5fa054535 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -162,14 +162,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemCom // XServiceInfo -OUString VCLXAccessibleMenuItem::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleMenuItem::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleMenuItem" ); } -Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleMenuItem"; @@ -180,7 +180,7 @@ Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (R // XAccessibleContext -sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); // IA2 CWS. MT: We had the aditional roles in UAA for ever, but never used them anywhere. @@ -202,7 +202,7 @@ sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole( ) throw (RuntimeException) // XAccessibleText -sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException) +sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -211,7 +211,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException) -sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -224,7 +224,7 @@ sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (Ind -sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -233,7 +233,7 @@ sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (Inde -Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) +Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -251,7 +251,7 @@ Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_In -awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -273,7 +273,7 @@ awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) th -sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException) +sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -282,7 +282,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException) -sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) +sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -303,7 +303,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th -OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException) +OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -312,7 +312,7 @@ OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException) -sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException) +sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -321,7 +321,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException) -sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException) +sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -330,7 +330,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException) -sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -342,7 +342,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 -OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException) +OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -351,7 +351,7 @@ OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException) -OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -360,7 +360,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 -::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -369,7 +369,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 -::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -378,7 +378,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 -::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -387,7 +387,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 -sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -425,7 +425,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd // XAccessibleAction -sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -434,7 +434,7 @@ sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeExce -sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -448,7 +448,7 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw ( -OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -460,7 +460,7 @@ OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nInd -Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -539,7 +539,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe // XAccessibleValue -Any VCLXAccessibleMenuItem::getCurrentValue( ) throw (RuntimeException) +Any VCLXAccessibleMenuItem::getCurrentValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -554,7 +554,7 @@ Any VCLXAccessibleMenuItem::getCurrentValue( ) throw (RuntimeException) -sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException) +sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -578,7 +578,7 @@ sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (Ru -Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException) +Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -590,7 +590,7 @@ Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException) -Any VCLXAccessibleMenuItem::getMinimumValue( ) throw (RuntimeException) +Any VCLXAccessibleMenuItem::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx index 52c8fb440894..c0ba53046f89 100644 --- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx @@ -47,14 +47,14 @@ VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator() // XServiceInfo -OUString VCLXAccessibleMenuSeparator::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleMenuSeparator::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleMenuSeparator" ); } -Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleMenuSeparator"; @@ -65,7 +65,7 @@ Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() thr // XAccessibleContext -sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index e12ece7b6990..16ed7167ee4a 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -54,14 +54,14 @@ sal_Bool VCLXAccessiblePopupMenu::IsFocused() // XServiceInfo -OUString VCLXAccessiblePopupMenu::getImplementationName() throw (RuntimeException) +OUString VCLXAccessiblePopupMenu::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessiblePopupMenu" ); } -Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessiblePopupMenu"; @@ -72,7 +72,7 @@ Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw ( // XAccessibleContext -sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -81,7 +81,7 @@ sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) throw (Runtime -sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -92,7 +92,7 @@ sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole( ) throw (RuntimeException // XAccessibleExtendedComponent -sal_Int32 VCLXAccessiblePopupMenu::getBackground( ) throw (RuntimeException) +sal_Int32 VCLXAccessiblePopupMenu::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index 0b272cb3d0a9..d9ae06a00fde 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -139,14 +139,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextC // XServiceInfo -OUString VCLXAccessibleRadioButton::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleRadioButton::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleRadioButton" ); } -Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleRadioButton"; @@ -157,7 +157,7 @@ Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw // XAccessibleAction -sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -166,7 +166,7 @@ sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeE -sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -182,7 +182,7 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) thro -OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -194,7 +194,7 @@ OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 n -Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -235,7 +235,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio // XAccessibleValue -Any VCLXAccessibleRadioButton::getCurrentValue( ) throw (RuntimeException) +Any VCLXAccessibleRadioButton::getCurrentValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -250,7 +250,7 @@ Any VCLXAccessibleRadioButton::getCurrentValue( ) throw (RuntimeException) -sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException) +sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -276,7 +276,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw -Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException) +Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -288,7 +288,7 @@ Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException) -Any VCLXAccessibleRadioButton::getMinimumValue( ) throw (RuntimeException) +Any VCLXAccessibleRadioButton::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 6148824809a9..3c772b4fe6fc 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -104,14 +104,14 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleCompone // XServiceInfo -OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleScrollBar" ); } -Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleScrollBar"; @@ -122,7 +122,7 @@ Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw ( // XAccessibleAction -sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -131,7 +131,7 @@ sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeExc -sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -160,7 +160,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw -OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -183,7 +183,7 @@ OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIn -Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -197,7 +197,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionK // XAccessibleValue -Any VCLXAccessibleScrollBar::getCurrentValue( ) throw (RuntimeException) +Any VCLXAccessibleScrollBar::getCurrentValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -212,7 +212,7 @@ Any VCLXAccessibleScrollBar::getCurrentValue( ) throw (RuntimeException) -sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (RuntimeException) +sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -240,7 +240,7 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R -Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException) +Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -255,7 +255,7 @@ Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException) -Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException) +Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -267,7 +267,7 @@ Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException) -OUString VCLXAccessibleScrollBar::getAccessibleName( ) throw (uno::RuntimeException) +OUString VCLXAccessibleScrollBar::getAccessibleName( ) throw (uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index b7791d89f810..5579a4ce122f 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -282,14 +282,14 @@ void VCLXAccessibleStatusBar::disposing() // XServiceInfo -OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBar" ); } -Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleStatusBar"; @@ -300,7 +300,7 @@ Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw ( // XAccessibleContext -sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -309,7 +309,7 @@ sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeExcep -Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -337,7 +337,7 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 // XAccessibleComponent -Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) +Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 66d9f7838c73..4a99f692efd4 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -229,21 +229,21 @@ void VCLXAccessibleStatusBarItem::disposing() // XServiceInfo -OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBarItem" ); } -sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException) +sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleStatusBarItem"; @@ -254,7 +254,7 @@ Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() thr // XAccessible -Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContext( ) throw (RuntimeException) +Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContext( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -265,7 +265,7 @@ Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContex // XAccessibleContext -sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -274,7 +274,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeE -Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -286,7 +286,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_In -Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -299,7 +299,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) th -sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -312,7 +312,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) throw (Run -sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -321,7 +321,7 @@ sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeExcep -OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (RuntimeException) +OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -334,7 +334,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (Runtim -OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) throw (RuntimeException) +OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -343,7 +343,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) throw (RuntimeExcept -Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -354,7 +354,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRe -Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet( ) throw (RuntimeException) +Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -375,7 +375,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleState -Locale VCLXAccessibleStatusBarItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) +Locale VCLXAccessibleStatusBarItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -386,7 +386,7 @@ Locale VCLXAccessibleStatusBarItem::getLocale( ) throw (IllegalAccessibleCompon // XAccessibleComponent -Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) +Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -395,14 +395,14 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( cons -void VCLXAccessibleStatusBarItem::grabFocus( ) throw (RuntimeException) +void VCLXAccessibleStatusBarItem::grabFocus( ) throw (RuntimeException, std::exception) { // no focus for status bar items } -sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -420,7 +420,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeExceptio -sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -440,7 +440,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) throw (RuntimeException // XAccessibleExtendedComponent -Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) throw (RuntimeException) +Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -458,7 +458,7 @@ Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) throw (RuntimeE -OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) throw (RuntimeException) +OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -467,7 +467,7 @@ OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) throw (RuntimeExce -OUString VCLXAccessibleStatusBarItem::getToolTipText( ) throw (RuntimeException) +OUString VCLXAccessibleStatusBarItem::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -478,7 +478,7 @@ OUString VCLXAccessibleStatusBarItem::getToolTipText( ) throw (RuntimeException // XAccessibleText -sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeException) +sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -487,7 +487,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeExceptio -sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -499,7 +499,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw -Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) +Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -523,7 +523,7 @@ Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( s -awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -546,7 +546,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex -sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) +sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -566,7 +566,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint -sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -578,7 +578,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_I -sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index 28daecd127a5..f161f400ab44 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -340,14 +340,14 @@ void VCLXAccessibleTabControl::disposing() // XServiceInfo -OUString VCLXAccessibleTabControl::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleTabControl::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleTabControl" ); } -Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleTabControl"; @@ -358,7 +358,7 @@ Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw // XAccessibleContext -sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -367,7 +367,7 @@ sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeExce -Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -393,7 +393,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 -sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -402,7 +402,7 @@ sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) throw (RuntimeExceptio -OUString VCLXAccessibleTabControl::getAccessibleName( ) throw (RuntimeException) +OUString VCLXAccessibleTabControl::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -413,7 +413,7 @@ OUString VCLXAccessibleTabControl::getAccessibleName( ) throw (RuntimeException // XAccessibleSelection -void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -426,7 +426,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th -sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -442,14 +442,14 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn -void VCLXAccessibleTabControl::clearAccessibleSelection( ) throw (RuntimeException) +void VCLXAccessibleTabControl::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { // This method makes no sense in a tab control, and so does nothing. } -void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) throw (RuntimeException) +void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -458,7 +458,7 @@ void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) throw (RuntimeExc -sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -467,7 +467,7 @@ sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) throw (R -Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -490,7 +490,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( s -void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 147747de1741..2fc80195a799 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -261,21 +261,21 @@ void VCLXAccessibleTabPage::disposing() // XServiceInfo -OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleTabPage" ); } -sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName ) throw (RuntimeException) +sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleTabPage"; @@ -286,7 +286,7 @@ Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (Ru // XAccessible -Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( ) throw (RuntimeException) +Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -297,7 +297,7 @@ Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( ) // XAccessibleContext -sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -314,7 +314,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeExcepti -Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -334,7 +334,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i -Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -347,7 +347,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) throw (R -sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -360,7 +360,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) throw (RuntimeEx -sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -369,7 +369,7 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException) -OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeException) +OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -382,7 +382,7 @@ OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeExc -OUString VCLXAccessibleTabPage::getAccessibleName( ) throw (RuntimeException) +OUString VCLXAccessibleTabPage::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -391,7 +391,7 @@ OUString VCLXAccessibleTabPage::getAccessibleName( ) throw (RuntimeException) -Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -402,7 +402,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelation -Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( ) throw (RuntimeException) +Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -423,7 +423,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( -Locale VCLXAccessibleTabPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) +Locale VCLXAccessibleTabPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -434,7 +434,7 @@ Locale VCLXAccessibleTabPage::getLocale( ) throw (IllegalAccessibleComponentSta // XAccessibleComponent -Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) +Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -463,7 +463,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt: -void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException) +void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -476,7 +476,7 @@ void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException) -sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -494,7 +494,7 @@ sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException) -sal_Int32 VCLXAccessibleTabPage::getBackground( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleTabPage::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -514,7 +514,7 @@ sal_Int32 VCLXAccessibleTabPage::getBackground( ) throw (RuntimeException) // XAccessibleExtendedComponent -Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) throw (RuntimeException) +Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -532,7 +532,7 @@ Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) throw (RuntimeExcepti -OUString VCLXAccessibleTabPage::getTitledBorderText( ) throw (RuntimeException) +OUString VCLXAccessibleTabPage::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -541,7 +541,7 @@ OUString VCLXAccessibleTabPage::getTitledBorderText( ) throw (RuntimeException) -OUString VCLXAccessibleTabPage::getToolTipText( ) throw (RuntimeException) +OUString VCLXAccessibleTabPage::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -552,7 +552,7 @@ OUString VCLXAccessibleTabPage::getToolTipText( ) throw (RuntimeException) // XAccessibleText -sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException) +sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -561,7 +561,7 @@ sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException) -sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -573,7 +573,7 @@ sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (Inde -Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) +Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -597,7 +597,7 @@ Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int -awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -618,7 +618,7 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) thr -sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) +sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -639,7 +639,7 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) thr -sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -651,7 +651,7 @@ sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 n -sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx index e5d6970c1f7a..33e929e59832 100644 --- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx +++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx @@ -102,7 +102,7 @@ void VCLXAccessibleTabPageWindow::disposing() // XAccessibleContext -Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -131,7 +131,7 @@ Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) th -sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 096797260e44..8d7a26165bbe 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -144,7 +144,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTextComponent, VCLXAccessibleCom // XAccessibleText -sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeException) +sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -153,7 +153,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeExceptio -sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -162,7 +162,7 @@ sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw -sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -171,7 +171,7 @@ sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw -Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) +Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -246,7 +246,7 @@ Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( s -awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -263,7 +263,7 @@ awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex -sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException) +sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -272,7 +272,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeExcepti -sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) +sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -286,7 +286,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint -OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException) +OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -295,7 +295,7 @@ OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException) -sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException) +sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -304,7 +304,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeExcepti -sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException) +sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -313,7 +313,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException -sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -325,7 +325,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I -OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException) +OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -334,7 +334,7 @@ OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException) -OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -343,7 +343,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I -::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -352,7 +352,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I -::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -361,7 +361,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I -::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -370,7 +370,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I -sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index 44c6df487765..3219be877f37 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -77,7 +77,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleTextField, VCLXAccessibleTextComp Reference SAL_CALL VCLXAccessibleTextField::getAccessibleContext (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return this; } @@ -86,7 +86,7 @@ Reference SAL_CALL //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 0; } @@ -95,7 +95,7 @@ sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount (void) Reference SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal_Int32) - throw (IndexOutOfBoundsException, RuntimeException) + throw (IndexOutOfBoundsException, RuntimeException, std::exception) { throw IndexOutOfBoundsException(); } @@ -104,7 +104,7 @@ Reference SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -112,7 +112,7 @@ sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole (void) } Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -124,7 +124,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent( //===== XServiceInfo ========================================================== OUString VCLXAccessibleTextField::getImplementationName (void) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleTextField" ); } @@ -133,7 +133,7 @@ OUString VCLXAccessibleTextField::getImplementationName (void) Sequence< OUString > VCLXAccessibleTextField::getSupportedServiceNames (void) - throw (RuntimeException) + 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 44d1140126f5..65b45799e3ae 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 (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; - sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException) + sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndexInParent; @@ -115,7 +115,7 @@ namespace ); // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception); 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) + sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException, std::exception) { if ( ( 16 == _rId.getLength() ) && ( 0 == memcmp( getUnoTunnelImplementationId().getConstArray(), _rId.getConstArray(), 16 ) ) @@ -679,12 +679,12 @@ void SAL_CALL VCLXAccessibleToolBox::disposing() } // XServiceInfo -OUString VCLXAccessibleToolBox::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleToolBox::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleToolBox" ); } -Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); @@ -694,7 +694,7 @@ Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (Ru } // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { comphelper::OExternalLockGuard aGuard( this ); @@ -706,7 +706,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) throw (Run return nCount; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { if ( i < 0 || i >= getAccessibleChildCount() ) throw IndexOutOfBoundsException(); @@ -753,7 +753,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal return NULL; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint ) throw (RuntimeException) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint ) throw (RuntimeException, std::exception) { comphelper::OExternalLockGuard aGuard( this ); @@ -798,7 +798,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetChildAccessible( const VclWin } // XAccessibleSelection -void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) @@ -808,7 +808,7 @@ void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw pToolBox->ChangeHighlight( nPos ); } -sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) @@ -821,20 +821,20 @@ sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex return sal_False; } -void VCLXAccessibleToolBox::clearAccessibleSelection( ) throw (RuntimeException) +void VCLXAccessibleToolBox::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() ); pToolBox -> LoseFocus(); } -void VCLXAccessibleToolBox::selectAllAccessibleChildren( ) throw (RuntimeException) +void VCLXAccessibleToolBox::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); // intentionally empty. makes no sense for a toolbox } -sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); sal_Int32 nRet = 0; @@ -849,7 +849,7 @@ sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) throw (Runt return nRet; } -Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() ) @@ -866,7 +866,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_ return xChild; } -void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 7329e0a2883c..97b2ea1df433 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -262,7 +262,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) +Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { // #i33611# - toolbox buttons without text don't support XAccessibleText if ( _rType == ::getCppuType( ( const Reference< XAccessibleText >* ) 0 ) @@ -289,17 +289,17 @@ void SAL_CALL VCLXAccessibleToolBoxItem::disposing() // XServiceInfo -OUString VCLXAccessibleToolBoxItem::getImplementationName() throw (RuntimeException) +OUString VCLXAccessibleToolBoxItem::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleToolBoxItem" ); } -sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceName ) throw (RuntimeException) +sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(4); aNames[0] = "com.sun.star.accessibility.AccessibleContext"; @@ -311,21 +311,21 @@ Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw // XAccessible -Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleContext( ) throw (RuntimeException) +Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleContext( ) throw (RuntimeException, std::exception) { return this; } // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { OContextEntryGuard aGuard( this ); return m_xChild.is() ? 1 : 0; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, com::sun::star::lang::IndexOutOfBoundsException) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, com::sun::star::lang::IndexOutOfBoundsException, std::exception) { OContextEntryGuard aGuard( this ); @@ -336,28 +336,28 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( return m_xChild; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent( ) throw (RuntimeException, std::exception) { OContextEntryGuard aGuard( this ); return m_pToolBox->GetAccessible(); } -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OContextEntryGuard aGuard( this ); return m_nIndexInParent; } -sal_Int16 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRole( ) throw (RuntimeException, std::exception) { OContextEntryGuard aGuard( this ); return m_nRole; } -OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( ) throw (RuntimeException) +OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -374,7 +374,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( ) throw } } -OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (RuntimeException) +OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -382,7 +382,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (Runtim return GetText( true ); } -Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OContextEntryGuard aGuard( this ); @@ -391,7 +391,7 @@ Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAcces return xSet; } -Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleStateSet( ) throw (RuntimeException) +Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -425,12 +425,12 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessib // XAccessibleText -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition() throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition() throw (RuntimeException, std::exception) { return -1; } -sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -440,7 +440,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex return sal_False; } -Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException) +Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -452,7 +452,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttrib return Sequence< PropertyValue >(); } -awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -473,7 +473,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 return aBounds; } -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -492,7 +492,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) +sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -502,7 +502,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex return sal_False; } -sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -537,12 +537,12 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa // XAccessibleComponent -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) { return Reference< XAccessible >(); } -void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus( ) throw (RuntimeException) +void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus( ) throw (RuntimeException, std::exception) { Reference< XAccessible > xParent(getAccessibleParent()); @@ -557,7 +557,7 @@ void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus( ) throw (RuntimeException) } } -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground( ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -568,7 +568,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground( ) throw (RuntimeEx return nColor; } -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeException) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -581,7 +581,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeEx // XAccessibleExtendedComponent -Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( ) throw (RuntimeException) +Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( ) throw (RuntimeException, std::exception) { return uno::Reference< awt::XFont >(); } @@ -591,7 +591,7 @@ awt::FontDescriptor SAL_CALL VCLXAccessibleToolBoxItem::getFontMetrics( const Re return xFont->getFontDescriptor(); } -OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) throw (RuntimeException) +OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -602,7 +602,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) throw (Runt return sRet; } -OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText( ) throw (RuntimeException) +OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -622,13 +622,13 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText( ) throw (RuntimeEx // XAccessibleAction -sal_Int32 VCLXAccessibleToolBoxItem::getAccessibleActionCount( ) throw (RuntimeException) +sal_Int32 VCLXAccessibleToolBoxItem::getAccessibleActionCount( ) throw (RuntimeException, std::exception) { // only one action -> "Click" return 1; } -sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -641,7 +641,7 @@ sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) thro return sal_True; } -OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) +OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -651,7 +651,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) +Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OContextEntryGuard aGuard( this ); @@ -663,7 +663,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActio // XAccessibleValue -Any VCLXAccessibleToolBoxItem::getCurrentValue( ) throw (RuntimeException) +Any VCLXAccessibleToolBoxItem::getCurrentValue( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -676,7 +676,7 @@ Any VCLXAccessibleToolBoxItem::getCurrentValue( ) throw (RuntimeException) return aValue; } -sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException) +sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -699,12 +699,12 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw return bReturn; } -Any VCLXAccessibleToolBoxItem::getMaximumValue( ) throw (RuntimeException) +Any VCLXAccessibleToolBoxItem::getMaximumValue( ) throw (RuntimeException, std::exception) { return makeAny((sal_Int32)1); } -Any VCLXAccessibleToolBoxItem::getMinimumValue( ) throw (RuntimeException) +Any VCLXAccessibleToolBoxItem::getMinimumValue( ) throw (RuntimeException, std::exception) { return makeAny((sal_Int32)0); } diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index 62592710607c..8aef03d388fa 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -134,154 +134,154 @@ public: virtual ~AnimationNode(); // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException); + virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException); - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException); + virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception); + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception); // XServiceInfo - OUString SAL_CALL getImplementationName() throw(); - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(); - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); + OUString SAL_CALL getImplementationName() throw(std::exception); + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception); + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception); // XChild - virtual Reference< XInterface > SAL_CALL getParent() throw (RuntimeException); - virtual void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException); + virtual Reference< XInterface > SAL_CALL getParent() throw (RuntimeException, std::exception); + virtual void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception); // XCloneable - virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException); + virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException, std::exception); // XAnimationNode - virtual sal_Int16 SAL_CALL getType() throw (RuntimeException); - virtual Any SAL_CALL getBegin() throw (RuntimeException); - virtual void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException); - virtual Any SAL_CALL getDuration() throw (RuntimeException); - virtual void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException); - virtual Any SAL_CALL getEnd() throw (RuntimeException); - virtual void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException); - virtual Any SAL_CALL getEndSync() throw (RuntimeException); - virtual void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException); - virtual Any SAL_CALL getRepeatCount() throw (RuntimeException); - virtual void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException); - virtual Any SAL_CALL getRepeatDuration() throw (RuntimeException); - virtual void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getFill() throw (RuntimeException); - virtual void SAL_CALL setFill( sal_Int16 _fill ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException); - virtual void SAL_CALL setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getRestart() throw (RuntimeException); - virtual void SAL_CALL setRestart( sal_Int16 _restart ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException); - virtual void SAL_CALL setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException); - virtual double SAL_CALL getAcceleration() throw (RuntimeException); - virtual void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException); - virtual double SAL_CALL getDecelerate() throw (RuntimeException); - virtual void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException); - virtual sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException); - virtual void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException); - virtual Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException); - virtual void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getType() throw (RuntimeException, std::exception); + virtual Any SAL_CALL getBegin() throw (RuntimeException, std::exception); + virtual void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getDuration() throw (RuntimeException, std::exception); + virtual void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getEnd() throw (RuntimeException, std::exception); + virtual void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getEndSync() throw (RuntimeException, std::exception); + virtual void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getRepeatCount() throw (RuntimeException, std::exception); + virtual void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getRepeatDuration() throw (RuntimeException, std::exception); + virtual void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getFill() throw (RuntimeException, std::exception); + virtual void SAL_CALL setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException, std::exception); + virtual void SAL_CALL setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getRestart() throw (RuntimeException, std::exception); + virtual void SAL_CALL setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException, std::exception); + virtual void SAL_CALL setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception); + virtual double SAL_CALL getAcceleration() throw (RuntimeException, std::exception); + virtual void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException, std::exception); + virtual double SAL_CALL getDecelerate() throw (RuntimeException, std::exception); + virtual void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException, std::exception); + virtual void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception); + virtual Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException, std::exception); + virtual void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception); // XAnimate - virtual Any SAL_CALL getTarget() throw (RuntimeException); - virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getSubItem() throw (RuntimeException); - virtual void SAL_CALL setSubItem( sal_Int16 _subitem ) throw (RuntimeException); - virtual OUString SAL_CALL getAttributeName() throw (RuntimeException); - virtual void SAL_CALL setAttributeName( const OUString& _attribute ) throw (RuntimeException); - virtual Sequence< Any > SAL_CALL getValues() throw (RuntimeException); - virtual void SAL_CALL setValues( const Sequence< Any >& _values ) throw (RuntimeException); - virtual Sequence< double > SAL_CALL getKeyTimes() throw (RuntimeException); - virtual void SAL_CALL setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getValueType() throw (RuntimeException); - virtual void SAL_CALL setValueType( sal_Int16 _valuetype ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getCalcMode() throw (RuntimeException); - virtual void SAL_CALL setCalcMode( sal_Int16 _calcmode ) throw (RuntimeException); - virtual sal_Bool SAL_CALL getAccumulate() throw (RuntimeException); - virtual void SAL_CALL setAccumulate( sal_Bool _accumulate ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getAdditive() throw (RuntimeException); - virtual void SAL_CALL setAdditive( sal_Int16 _additive ) throw (RuntimeException); - virtual Any SAL_CALL getFrom() throw (RuntimeException); - virtual void SAL_CALL setFrom( const Any& _from ) throw (RuntimeException); - virtual Any SAL_CALL getTo() throw (RuntimeException); - virtual void SAL_CALL setTo( const Any& _to ) throw (RuntimeException); - virtual Any SAL_CALL getBy() throw (RuntimeException); - virtual void SAL_CALL setBy( const Any& _by ) throw (RuntimeException); - virtual Sequence< TimeFilterPair > SAL_CALL getTimeFilter() throw (RuntimeException); - virtual void SAL_CALL setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) throw (RuntimeException); - virtual OUString SAL_CALL getFormula() throw (RuntimeException); - virtual void SAL_CALL setFormula( const OUString& _formula ) throw (RuntimeException); + virtual Any SAL_CALL getTarget() throw (RuntimeException, std::exception); + virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getSubItem() throw (RuntimeException, std::exception); + virtual void SAL_CALL setSubItem( sal_Int16 _subitem ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getAttributeName() throw (RuntimeException, std::exception); + virtual void SAL_CALL setAttributeName( const OUString& _attribute ) throw (RuntimeException, std::exception); + virtual Sequence< Any > SAL_CALL getValues() throw (RuntimeException, std::exception); + virtual void SAL_CALL setValues( const Sequence< Any >& _values ) throw (RuntimeException, std::exception); + virtual Sequence< double > SAL_CALL getKeyTimes() throw (RuntimeException, std::exception); + virtual void SAL_CALL setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getValueType() throw (RuntimeException, std::exception); + virtual void SAL_CALL setValueType( sal_Int16 _valuetype ) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getCalcMode() throw (RuntimeException, std::exception); + virtual void SAL_CALL setCalcMode( sal_Int16 _calcmode ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAccumulate() throw (RuntimeException, std::exception); + virtual void SAL_CALL setAccumulate( sal_Bool _accumulate ) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAdditive() throw (RuntimeException, std::exception); + virtual void SAL_CALL setAdditive( sal_Int16 _additive ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getFrom() throw (RuntimeException, std::exception); + virtual void SAL_CALL setFrom( const Any& _from ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getTo() throw (RuntimeException, std::exception); + virtual void SAL_CALL setTo( const Any& _to ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getBy() throw (RuntimeException, std::exception); + virtual void SAL_CALL setBy( const Any& _by ) throw (RuntimeException, std::exception); + virtual Sequence< TimeFilterPair > SAL_CALL getTimeFilter() throw (RuntimeException, std::exception); + virtual void SAL_CALL setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getFormula() throw (RuntimeException, std::exception); + virtual void SAL_CALL setFormula( const OUString& _formula ) throw (RuntimeException, std::exception); // XAnimateColor - virtual sal_Int16 SAL_CALL getColorInterpolation() throw (RuntimeException); - virtual void SAL_CALL setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException); - virtual sal_Bool SAL_CALL getDirection() throw (RuntimeException); - virtual void SAL_CALL setDirection( sal_Bool _direction ) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getColorInterpolation() throw (RuntimeException, std::exception); + virtual void SAL_CALL setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getDirection() throw (RuntimeException, std::exception); + virtual void SAL_CALL setDirection( sal_Bool _direction ) throw (RuntimeException, std::exception); // XAnimateMotion - virtual Any SAL_CALL getPath() throw (RuntimeException); - virtual void SAL_CALL setPath( const Any& _path ) throw (RuntimeException); - virtual Any SAL_CALL getOrigin() throw (RuntimeException); - virtual void SAL_CALL setOrigin( const Any& _origin ) throw (RuntimeException); + virtual Any SAL_CALL getPath() throw (RuntimeException, std::exception); + virtual void SAL_CALL setPath( const Any& _path ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getOrigin() throw (RuntimeException, std::exception); + virtual void SAL_CALL setOrigin( const Any& _origin ) throw (RuntimeException, std::exception); // XAnimateTransform - virtual sal_Int16 SAL_CALL getTransformType() throw (RuntimeException); - virtual void SAL_CALL setTransformType( sal_Int16 _transformtype ) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getTransformType() throw (RuntimeException, std::exception); + virtual void SAL_CALL setTransformType( sal_Int16 _transformtype ) throw (RuntimeException, std::exception); // XTransitionFilter - virtual sal_Int16 SAL_CALL getTransition() throw (RuntimeException); - virtual void SAL_CALL setTransition( sal_Int16 _transition ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getSubtype() throw (RuntimeException); - virtual void SAL_CALL setSubtype( sal_Int16 _subtype ) throw (RuntimeException); - virtual sal_Bool SAL_CALL getMode() throw (RuntimeException); - virtual void SAL_CALL setMode( sal_Bool _mode ) throw (RuntimeException); - virtual sal_Int32 SAL_CALL getFadeColor() throw (RuntimeException); - virtual void SAL_CALL setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getTransition() throw (RuntimeException, std::exception); + virtual void SAL_CALL setTransition( sal_Int16 _transition ) throw (RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getSubtype() throw (RuntimeException, std::exception); + virtual void SAL_CALL setSubtype( sal_Int16 _subtype ) throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getMode() throw (RuntimeException, std::exception); + virtual void SAL_CALL setMode( sal_Bool _mode ) throw (RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getFadeColor() throw (RuntimeException, std::exception); + virtual void SAL_CALL setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException, std::exception); // XAudio - virtual Any SAL_CALL getSource() throw (RuntimeException); - virtual void SAL_CALL setSource( const Any& _source ) throw (RuntimeException); - virtual double SAL_CALL getVolume() throw (RuntimeException); - virtual void SAL_CALL setVolume( double _volume ) throw (RuntimeException); + virtual Any SAL_CALL getSource() throw (RuntimeException, std::exception); + virtual void SAL_CALL setSource( const Any& _source ) throw (RuntimeException, std::exception); + virtual double SAL_CALL getVolume() throw (RuntimeException, std::exception); + virtual void SAL_CALL setVolume( double _volume ) throw (RuntimeException, std::exception); // 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); - virtual void SAL_CALL setCommand( sal_Int16 _command ) throw (RuntimeException); - virtual Any SAL_CALL getParameter() throw (RuntimeException); - virtual void SAL_CALL setParameter( const Any& _parameter ) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getCommand() throw (RuntimeException, std::exception); + virtual void SAL_CALL setCommand( sal_Int16 _command ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL getParameter() throw (RuntimeException, std::exception); + virtual void SAL_CALL setParameter( const Any& _parameter ) throw (RuntimeException, std::exception); // XElementAccess - virtual Type SAL_CALL getElementType() throw (RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException); + virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception); // XEnumerationAccess - virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException); + virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception); // XTimeContainer - virtual Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException); - virtual Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException); - virtual Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException); - virtual Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException); - virtual Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException); + virtual Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); + virtual Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); + virtual Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); + virtual Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception); + virtual Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception); // XIterateContainer - virtual sal_Int16 SAL_CALL getIterateType() throw (RuntimeException); - virtual void SAL_CALL setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException); - virtual double SAL_CALL getIterateInterval() throw (RuntimeException); - virtual void SAL_CALL setIterateInterval( double _iterateinterval ) throw (RuntimeException); + virtual sal_Int16 SAL_CALL getIterateType() throw (RuntimeException, std::exception); + virtual void SAL_CALL setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException, std::exception); + virtual double SAL_CALL getIterateInterval() throw (RuntimeException, std::exception); + virtual void SAL_CALL setIterateInterval( double _iterateinterval ) throw (RuntimeException, std::exception); // XChangesNotifier - virtual void SAL_CALL addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException); - virtual void SAL_CALL removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException); + virtual void SAL_CALL addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception); + virtual void SAL_CALL removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception); // XUnoTunnel - virtual ::sal_Int64 SAL_CALL getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) throw (RuntimeException); + virtual ::sal_Int64 SAL_CALL getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception); static const Sequence< sal_Int8 > & getUnoTunnelId(); void fireChangeListener(); @@ -359,8 +359,8 @@ public: virtual ~TimeContainerEnumeration(); // Methods - virtual sal_Bool SAL_CALL hasMoreElements() throw (RuntimeException); - virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); + virtual sal_Bool SAL_CALL hasMoreElements() throw (RuntimeException, std::exception); + virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception); private: /** sorted list of child nodes */ @@ -384,7 +384,7 @@ TimeContainerEnumeration::~TimeContainerEnumeration() } // Methods -sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeException) +sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -392,7 +392,7 @@ sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeExce } Any SAL_CALL TimeContainerEnumeration::nextElement() - throw (NoSuchElementException, WrappedTargetException, RuntimeException) + throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -543,7 +543,7 @@ IMPL_NODE_FACTORY( COMMAND, "animcore::Command", "com.sun.star.animations.Comman // XInterface -Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeException) +Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) { Any aRet( ::cppu::queryInterface( aType, @@ -718,7 +718,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw() -Sequence< Type > AnimationNode::getTypes() throw (RuntimeException) +Sequence< Type > AnimationNode::getTypes() throw (RuntimeException, std::exception) { if (! mpTypes[mnNodeType]) initTypeProvider(mnNodeType); @@ -726,7 +726,7 @@ Sequence< Type > AnimationNode::getTypes() throw (RuntimeException) } -Sequence< sal_Int8 > AnimationNode::getImplementationId() throw (RuntimeException) +Sequence< sal_Int8 > AnimationNode::getImplementationId() throw (RuntimeException, std::exception) { if (! mpId[mnNodeType]) initTypeProvider(mnNodeType); @@ -752,7 +752,7 @@ void SAL_CALL AnimationNode::release( ) throw () // XServiceInfo -OUString AnimationNode::getImplementationName() throw() +OUString AnimationNode::getImplementationName() throw(std::exception) { switch( mnNodeType ) { @@ -783,13 +783,13 @@ OUString AnimationNode::getImplementationName() throw() } // XServiceInfo -sal_Bool AnimationNode::supportsService(const OUString& ServiceName) throw() +sal_Bool AnimationNode::supportsService(const OUString& ServiceName) throw(std::exception) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > AnimationNode::getSupportedServiceNames(void) throw() +Sequence< OUString > AnimationNode::getSupportedServiceNames(void) throw(std::exception) { switch( mnNodeType ) { @@ -820,7 +820,7 @@ Sequence< OUString > AnimationNode::getSupportedServiceNames(void) throw() // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnNodeType; @@ -829,7 +829,7 @@ sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException) // XAnimationNode -Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException) +Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maBegin; @@ -838,7 +838,7 @@ Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeException) +void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _begin != maBegin ) @@ -851,7 +851,7 @@ void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeExcepti // XAnimationNode -Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException) +Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maDuration; @@ -860,7 +860,7 @@ Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeException) +void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _duration != maDuration ) @@ -873,7 +873,7 @@ void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeE // XAnimationNode -Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException) +Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maEnd; @@ -882,7 +882,7 @@ Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException) +void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _end != maEnd ) @@ -895,7 +895,7 @@ void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException) // XAnimationNode -Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException) +Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maEndSync; @@ -904,7 +904,7 @@ Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException) +void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _endsync != maEndSync ) @@ -917,7 +917,7 @@ void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeExc // XAnimationNode -Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException) +Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maRepeatCount; @@ -926,7 +926,7 @@ Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException) +void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _repeatcount != maRepeatCount ) @@ -939,7 +939,7 @@ void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (Ru // XAnimationNode -Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException) +Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maRepeatDuration; @@ -948,7 +948,7 @@ Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException) +void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _repeatduration != maRepeatDuration ) @@ -961,7 +961,7 @@ void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) thr // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnFill; @@ -970,7 +970,7 @@ sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException) +void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _fill != mnFill ) @@ -983,7 +983,7 @@ void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException) // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnFillDefault; @@ -992,7 +992,7 @@ sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException) +void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _filldefault != mnFillDefault ) @@ -1005,7 +1005,7 @@ void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (Run // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnRestart; @@ -1014,7 +1014,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException) +void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _restart != mnRestart ) @@ -1027,7 +1027,7 @@ void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeExce // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnRestartDefault; @@ -1036,7 +1036,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException) +void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _restartdefault != mnRestartDefault ) @@ -1049,7 +1049,7 @@ void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) thro // XAnimationNode -double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException) +double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mfAcceleration; @@ -1058,7 +1058,7 @@ double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException) +void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _acceleration != mfAcceleration ) @@ -1071,7 +1071,7 @@ void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (Runt // XAnimationNode -double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException) +double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mfDecelerate; @@ -1080,7 +1080,7 @@ double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException) +void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _decelerate != mfDecelerate ) @@ -1093,7 +1093,7 @@ void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeE // XAnimationNode -sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException) +sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mbAutoReverse; @@ -1102,7 +1102,7 @@ sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException) // XAnimationNode -void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException) +void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _autoreverse != mbAutoReverse ) @@ -1114,7 +1114,7 @@ void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (Runt -Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeException) +Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maUserData; @@ -1122,7 +1122,7 @@ Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeExcep -void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException) +void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maUserData = _userdata; @@ -1132,7 +1132,7 @@ void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdat // XChild -Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeException) +Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mxParent.get(); @@ -1141,7 +1141,7 @@ Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeExcept // XChild -void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException) +void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( Parent != mxParent.get() ) @@ -1160,7 +1160,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) // XCloneable -Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeException) +Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1205,7 +1205,7 @@ Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeExce // XAnimate Any SAL_CALL AnimationNode::getTarget() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maTarget; @@ -1215,7 +1215,7 @@ Any SAL_CALL AnimationNode::getTarget() // XAnimate void SAL_CALL AnimationNode::setTarget( const Any& _target ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _target != maTarget ) @@ -1228,7 +1228,7 @@ void SAL_CALL AnimationNode::setTarget( const Any& _target ) // XAnimate -OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException) +OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maAttributeName; @@ -1238,7 +1238,7 @@ OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException) // XAnimate void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _attribute != maAttributeName ) @@ -1252,7 +1252,7 @@ void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute ) // XAnimate Sequence< Any > SAL_CALL AnimationNode::getValues() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maValues; @@ -1262,7 +1262,7 @@ Sequence< Any > SAL_CALL AnimationNode::getValues() // XAnimate void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maValues = _values; @@ -1272,7 +1272,7 @@ void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values ) // XAnimate -sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnSubItem; @@ -1281,7 +1281,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException) // XAnimate -void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeException) +void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _subitem != mnSubItem ) @@ -1294,7 +1294,7 @@ void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeExce // XAnimate -Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException) +Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maKeyTimes; @@ -1303,7 +1303,7 @@ Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException // XAnimate -void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException) +void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maKeyTimes = _keytimes; @@ -1313,7 +1313,7 @@ void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) // XAnimate -sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnValueType; @@ -1321,7 +1321,7 @@ sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException) -void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (RuntimeException) +void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _valuetype != mnValueType ) @@ -1335,7 +1335,7 @@ void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (Runtime // XAnimate sal_Int16 SAL_CALL AnimationNode::getCalcMode() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnCalcMode; @@ -1345,7 +1345,7 @@ sal_Int16 SAL_CALL AnimationNode::getCalcMode() // XAnimate void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _calcmode != mnCalcMode ) @@ -1359,7 +1359,7 @@ void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode ) // XAnimate sal_Bool SAL_CALL AnimationNode::getAccumulate() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mbAccumulate; @@ -1369,7 +1369,7 @@ sal_Bool SAL_CALL AnimationNode::getAccumulate() // XAnimate void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _accumulate != mbAccumulate ) @@ -1383,7 +1383,7 @@ void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate ) // XAnimate sal_Int16 SAL_CALL AnimationNode::getAdditive() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnAdditive; @@ -1393,7 +1393,7 @@ sal_Int16 SAL_CALL AnimationNode::getAdditive() // XAnimate void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _additive != mnAdditive ) @@ -1407,7 +1407,7 @@ void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive ) // XAnimate Any SAL_CALL AnimationNode::getFrom() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maFrom; @@ -1417,7 +1417,7 @@ Any SAL_CALL AnimationNode::getFrom() // XAnimate void SAL_CALL AnimationNode::setFrom( const Any& _from ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _from != maFrom ) @@ -1431,7 +1431,7 @@ void SAL_CALL AnimationNode::setFrom( const Any& _from ) // XAnimate Any SAL_CALL AnimationNode::getTo() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maTo; @@ -1441,7 +1441,7 @@ Any SAL_CALL AnimationNode::getTo() // XAnimate void SAL_CALL AnimationNode::setTo( const Any& _to ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _to != maTo ) @@ -1455,7 +1455,7 @@ void SAL_CALL AnimationNode::setTo( const Any& _to ) // XAnimate Any SAL_CALL AnimationNode::getBy() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maBy; @@ -1465,7 +1465,7 @@ Any SAL_CALL AnimationNode::getBy() // XAnimate void SAL_CALL AnimationNode::setBy( const Any& _by ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _by != maBy ) @@ -1479,7 +1479,7 @@ void SAL_CALL AnimationNode::setBy( const Any& _by ) // XAnimate Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maTimeFilter; @@ -1489,7 +1489,7 @@ Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter() // XAnimate void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maTimeFilter = _timefilter; @@ -1498,7 +1498,7 @@ void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _t -OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException) +OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maFormula; @@ -1506,7 +1506,7 @@ OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException) -void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (RuntimeException) +void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _formula != maFormula ) @@ -1519,7 +1519,7 @@ void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (Runti // XAnimateColor -sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnColorSpace; @@ -1528,7 +1528,7 @@ sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeExceptio // XAnimateColor -void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException) +void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _colorspace != mnColorSpace ) @@ -1541,7 +1541,7 @@ void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) thro // XAnimateColor -sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException) +sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mbDirection; @@ -1550,7 +1550,7 @@ sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException) // XAnimateColor -void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException) +void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _direction != mbDirection ) @@ -1563,7 +1563,7 @@ void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeE // XAnimateMotion -Any SAL_CALL AnimationNode::getPath() throw (RuntimeException) +Any SAL_CALL AnimationNode::getPath() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maPath; @@ -1572,7 +1572,7 @@ Any SAL_CALL AnimationNode::getPath() throw (RuntimeException) // XAnimateMotion -void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException) +void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maPath = _path; @@ -1582,7 +1582,7 @@ void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException // XAnimateMotion -Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException) +Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maOrigin; @@ -1591,7 +1591,7 @@ Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException) // XAnimateMotion -void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeException) +void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maOrigin = _origin; @@ -1601,7 +1601,7 @@ void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeExcep // XAnimateTransform -sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnTransformType; @@ -1610,7 +1610,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException) // XAnimateTransform -void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw (RuntimeException) +void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _transformtype != mnTransformType ) @@ -1623,7 +1623,7 @@ void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw // XTransitionFilter -sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnTransition; @@ -1632,7 +1632,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException) // XTransitionFilter -void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (RuntimeException) +void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _transition != mnTransition ) @@ -1645,7 +1645,7 @@ void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (Runti // XTransitionFilter -sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnSubtype; @@ -1654,7 +1654,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException) // XTransitionFilter -void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeException) +void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _subtype != mnSubtype ) @@ -1667,7 +1667,7 @@ void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeExce // XTransitionFilter -sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException) +sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mbMode; @@ -1676,7 +1676,7 @@ sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException) // XTransitionFilter -void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException) +void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _mode != mbMode ) @@ -1689,7 +1689,7 @@ void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException) // XTransitionFilter -sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException) +sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnFadeColor; @@ -1698,7 +1698,7 @@ sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException) // XTransitionFilter -void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException) +void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _fadecolor != mnFadeColor ) @@ -1711,7 +1711,7 @@ void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (Runtime // XAudio -Any SAL_CALL AnimationNode::getSource() throw (RuntimeException) +Any SAL_CALL AnimationNode::getSource() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maTarget; @@ -1720,7 +1720,7 @@ Any SAL_CALL AnimationNode::getSource() throw (RuntimeException) // XAudio -void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeException) +void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maTarget = _source; @@ -1730,7 +1730,7 @@ void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeExcep // XAudio -double SAL_CALL AnimationNode::getVolume() throw (RuntimeException) +double SAL_CALL AnimationNode::getVolume() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mfVolume; @@ -1739,7 +1739,7 @@ double SAL_CALL AnimationNode::getVolume() throw (RuntimeException) // XAudio -void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException) +void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _volume != mfVolume ) @@ -1752,7 +1752,7 @@ void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException // XCommand -sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnCommand; @@ -1761,7 +1761,7 @@ sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException) // XCommand -void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeException) +void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _command != mnCommand ) @@ -1774,7 +1774,7 @@ void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeExce // XCommand -Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException) +Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maParameter; @@ -1783,7 +1783,7 @@ Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException) // XCommand -void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (RuntimeException) +void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maParameter = _parameter; @@ -1793,7 +1793,7 @@ void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (Runtim // XElementAccess -Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException) +Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException, std::exception) { return ::getCppuType((const Reference< XAnimationNode >*)0); } @@ -1801,7 +1801,7 @@ Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException) // XElementAccess -sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException) +sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return !maChildren.empty(); @@ -1811,7 +1811,7 @@ sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException) // XEnumerationAccess Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1823,7 +1823,7 @@ 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) + throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1849,7 +1849,7 @@ 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) + throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1879,7 +1879,7 @@ 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) + throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1908,7 +1908,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference< XAnimationNode >& oldChild ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1931,7 +1931,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference< XAnimationNode >& newChild ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1957,7 +1957,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference // XIterateContainer -sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException) +sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnIterateType; @@ -1966,7 +1966,7 @@ sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException) // XIterateContainer -void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException) +void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _iteratetype != mnIterateType ) @@ -1979,7 +1979,7 @@ void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (Run // XIterateContainer -double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException) +double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mfIterateInterval; @@ -1988,7 +1988,7 @@ double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException) // XIterateContainer -void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw (RuntimeException) +void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _iterateinterval != mfIterateInterval ) @@ -2001,7 +2001,7 @@ void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw // XChangesNotifier -void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException) +void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) { maChangeListener.addInterface( aListener ); } @@ -2009,7 +2009,7 @@ void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListen // XChangesNotifier -void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException) +void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) { maChangeListener.removeInterface(aListener); } @@ -2017,7 +2017,7 @@ void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesLis // XUnoTunnel -::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) throw (RuntimeException) +::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) throw (RuntimeException, std::exception) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx index f31cddc50463..84f061863f82 100644 --- a/animations/source/animcore/targetpropertiescreator.cxx +++ b/animations/source/animcore/targetpropertiescreator.cxx @@ -67,15 +67,15 @@ namespace animcore virtual void SAL_CALL disposing(); // XTargetPropertiesCreator - virtual uno::Sequence< animations::TargetProperties > SAL_CALL createInitialTargetProperties( const uno::Reference< animations::XAnimationNode >& rootNode ) throw (uno::RuntimeException); + virtual uno::Sequence< animations::TargetProperties > SAL_CALL createInitialTargetProperties( const uno::Reference< animations::XAnimationNode >& rootNode ) throw (uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( uno::RuntimeException, std::exception ); // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException, std::exception); protected: ~TargetPropertiesCreator(); // we're a ref-counted UNO class. _We_ destroy ourselves. @@ -408,7 +408,7 @@ namespace animcore uno::Sequence< animations::TargetProperties > SAL_CALL TargetPropertiesCreator::createInitialTargetProperties ( const uno::Reference< animations::XAnimationNode >& xRootNode - ) throw (uno::RuntimeException) + ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -457,17 +457,17 @@ namespace animcore } // XServiceInfo - OUString SAL_CALL TargetPropertiesCreator::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL TargetPropertiesCreator::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( IMPLEMENTATION_NAME ); } - sal_Bool SAL_CALL TargetPropertiesCreator::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL TargetPropertiesCreator::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL TargetPropertiesCreator::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL TargetPropertiesCreator::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = SERVICE_NAME; @@ -476,7 +476,7 @@ namespace animcore } // XServiceName - OUString SAL_CALL TargetPropertiesCreator::getServiceName( ) throw (uno::RuntimeException) + OUString SAL_CALL TargetPropertiesCreator::getServiceName( ) throw (uno::RuntimeException, std::exception) { return OUString( SERVICE_NAME ); } diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 22c67208cb60..c6f82097e434 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -49,7 +49,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 ) +css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) { /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ /* Ask for my own supported interfaces ...*/ @@ -69,7 +69,7 @@ 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 ) +css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() throw( css::uno::RuntimeException, std::exception ) { /* Create one Id for all instances of this class. */ /* Use ethernet address to do this! (sal_True) */ @@ -93,7 +93,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() thro return pID->getImplementationId(); } -css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( css::uno::RuntimeException ) +css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( css::uno::RuntimeException, std::exception ) { /* Optimize this method ! */ /* We initialize a static variable only one time. */ @@ -130,19 +130,19 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs /*===========================================================================================================*/ /* XServiceInfo */ /*===========================================================================================================*/ -OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException ) +OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException, std::exception ) { return impl_getStaticImplementationName(); } // XServiceInfo -sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException ) +sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, sServiceName); } // XServiceInfo -css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException ) +css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { return impl_getStaticSupportedServiceNames(); } @@ -259,7 +259,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) + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) { // SAFE { const ::osl::MutexGuard aLock( m_aLock ); @@ -309,7 +309,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 ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } @@ -338,7 +338,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 ) +OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) { // 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 1e9329bc10a0..f1d9b629926c 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -77,16 +77,16 @@ class SoundHandler : // interfaces virtual ~SoundHandler( ); // XInterface, XTypeProvider, XServiceInfo - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException ); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException ); + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ); /* interface XServiceInfo */ - virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException ); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ); /* Helper for XServiceInfo */ static css::uno::Sequence< OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); static OUString SAL_CALL impl_getStaticImplementationName ( ); @@ -99,19 +99,19 @@ class SoundHandler : // interfaces // 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); + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception); // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException ); + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ); // not supported ! virtual void SAL_CALL addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) {}; + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) {}; virtual void SAL_CALL removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException ) {}; + const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) {}; // XExtendedFilterDetection - virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException ); + virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ); // protected methods protected: diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 97efa0e0d3ac..acf025248506 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -105,7 +105,7 @@ FrameGrabber* FrameGrabber::create( const OUString &rURL ) } uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< graphic::XGraphic > xRet; @@ -204,19 +204,19 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe } OUString SAL_CALL FrameGrabber::getImplementationName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_GST_FRAMEGRABBER_SERVICENAME; diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx index ccacba2d4dea..45846d547919 100644 --- a/avmedia/source/gstreamer/gstframegrabber.hxx +++ b/avmedia/source/gstreamer/gstframegrabber.hxx @@ -44,12 +44,12 @@ public: virtual ~FrameGrabber(); // XFrameGrabber - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: FrameGrabber( const OUString &aURL ); diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index 96ecc4c1831c..374f68a49625 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -57,7 +57,7 @@ Manager::~Manager() uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Player* pPlayer( new Player( mxMgr ) ); uno::Reference< media::XPlayer > xRet( pPlayer ); @@ -74,7 +74,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& OUString SAL_CALL Manager::getImplementationName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME ); } @@ -82,7 +82,7 @@ OUString SAL_CALL Manager::getImplementationName( ) sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } @@ -90,7 +90,7 @@ sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_GST_MANAGER_SERVICENAME ; diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx index ca8318dcc825..1c73817af13d 100644 --- a/avmedia/source/gstreamer/gstmanager.hxx +++ b/avmedia/source/gstreamer/gstmanager.hxx @@ -39,12 +39,12 @@ public: ~Manager(); // XManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index f5e34e9ad95b..713b900e59ad 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -397,7 +397,7 @@ bool Player::create( const OUString& rURL ) void SAL_CALL Player::start() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -412,7 +412,7 @@ void SAL_CALL Player::start() void SAL_CALL Player::stop() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -427,7 +427,7 @@ void SAL_CALL Player::stop() sal_Bool SAL_CALL Player::isPlaying() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -447,7 +447,7 @@ sal_Bool SAL_CALL Player::isPlaying() double SAL_CALL Player::getDuration() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -464,7 +464,7 @@ double SAL_CALL Player::getDuration() void SAL_CALL Player::setMediaTime( double fTime ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -486,7 +486,7 @@ void SAL_CALL Player::setMediaTime( double fTime ) double SAL_CALL Player::getMediaTime() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -505,7 +505,7 @@ double SAL_CALL Player::getMediaTime() double SAL_CALL Player::getRate() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -520,7 +520,7 @@ double SAL_CALL Player::getRate() void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); // TODO check how to do with GST @@ -530,7 +530,7 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) sal_Bool SAL_CALL Player::isPlaybackLoop() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); // TODO check how to do with GST @@ -540,7 +540,7 @@ sal_Bool SAL_CALL Player::isPlaybackLoop() void SAL_CALL Player::setMute( sal_Bool bSet ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -564,7 +564,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet ) sal_Bool SAL_CALL Player::isMute() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -574,7 +574,7 @@ sal_Bool SAL_CALL Player::isMute() void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -592,7 +592,7 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) sal_Int16 SAL_CALL Player::getVolumeDB() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -612,7 +612,7 @@ sal_Int16 SAL_CALL Player::getVolumeDB() awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -645,7 +645,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -687,7 +687,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); FrameGrabber* pFrameGrabber = NULL; @@ -703,7 +703,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() OUString SAL_CALL Player::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME ); } @@ -711,7 +711,7 @@ OUString SAL_CALL Player::getImplementationName() sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } @@ -719,7 +719,7 @@ sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_GST_PLAYER_SERVICENAME ; diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 7cef5cc2fd38..5ac00200c5ae 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -52,27 +52,27 @@ public: virtual GstBusSyncReply processSyncMessage( GstMessage *message ); // XPlayer - virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getRate( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL start( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL stop( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isPlaying( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getRate( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isMute( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index fee4626f071d..b9f3e321e7e4 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -70,12 +70,12 @@ Window::~Window() void SAL_CALL Window::update( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bRet = false; @@ -94,13 +94,13 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) } media::ZoomLevel SAL_CALL Window::getZoomLevel( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return meZoomLevel; } void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { mnPointerType = nPointerType; } @@ -109,12 +109,12 @@ 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) + throw (uno::RuntimeException, std::exception) { } awt::Rectangle SAL_CALL Window::getPosSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Rectangle aRet; @@ -126,77 +126,77 @@ awt::Rectangle SAL_CALL Window::getPosSize() } void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::setFocus( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } @@ -204,17 +204,17 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList void SAL_CALL Window::dispose( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } @@ -222,19 +222,19 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis OUString SAL_CALL Window::getImplementationName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_GST_WINDOW_SERVICENAME ; diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index e2e303cdc395..33d95e234dd3 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -47,39 +47,39 @@ public: void updatePointer(); // XPlayerWindow - virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XWindow - virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index 966d83a026d0..3c411b9b4b08 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -52,14 +52,14 @@ void MediaEventListenersImpl::cleanUp() void SAL_CALL MediaEventListenersImpl::disposing( const ::com::sun::star::lang::EventObject& /* Source */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt::KeyEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -79,7 +79,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const ::com::sun::star::awt:: void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt::KeyEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -98,7 +98,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const ::com::sun::star::awt: void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt::MouseEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -119,7 +119,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const ::com::sun::star::awt // ----------------------------------------------gvd----------------------- void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -140,7 +140,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const ::com::sun::star::aw void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt::MouseEvent& /* e */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -153,7 +153,7 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const ::com::sun::star::awt void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt::MouseEvent& /* e */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -166,7 +166,7 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const ::com::sun::star::awt: void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -181,7 +181,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const ::com::sun::star::awt void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -196,14 +196,14 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const ::com::sun::star::awt:: void SAL_CALL MediaEventListenersImpl::focusGained( const ::com::sun::star::awt::FocusEvent& /* e */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { } void SAL_CALL MediaEventListenersImpl::focusLost( const ::com::sun::star::awt::FocusEvent& /* e */ ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { } diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx index 3b695e057c9b..6440f09d6e15 100644 --- a/avmedia/source/viewer/mediaevent_impl.hxx +++ b/avmedia/source/viewer/mediaevent_impl.hxx @@ -49,23 +49,23 @@ namespace avmedia protected: // XKeyListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XMouseListener - virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XMouseMotionListener - virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL mouseDragged( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL mouseMoved( const ::com::sun::star::awt::MouseEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XFocusListener - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index af3fef91e40f..a1a2ae836ede 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -48,7 +48,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString } ::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { osl::Condition condition; @@ -95,19 +95,19 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString return Graphic( bitmap ).GetXGraphic(); } -::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) +::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME; } ::sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_VLC_GRABBER_SERVICENAME; diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx index 51ba6191b225..6be205ae9825 100644 --- a/avmedia/source/vlc/vlcframegrabber.hxx +++ b/avmedia/source/vlc/vlcframegrabber.hxx @@ -42,14 +42,14 @@ public: VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url ); ::com::sun::star::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::rtl::OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); }; } diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index 8395d0caf994..296c35011a42 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -83,7 +83,7 @@ Manager::~Manager() } uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUString& rURL ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if ( !m_is_vlc_found ) throw uno::RuntimeException("VLC not found", 0); @@ -107,19 +107,19 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt } rtl::OUString SAL_CALL Manager::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return VLC_IMPLEMENTATION_NAME; } sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::uno::Sequence< OUString > aRet(1); aRet[0] = VLC_SERVICENAME; diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx index 30274d8bef14..297a99818a72 100644 --- a/avmedia/source/vlc/vlcmanager.hxx +++ b/avmedia/source/vlc/vlcmanager.hxx @@ -36,11 +36,11 @@ public: Manager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr ); ~Manager(); - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); - rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 598ed9269dfc..5cd516214ee2 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -47,7 +47,7 @@ unsigned VLCPlayer::getHeight() const return mPlayer.getHeight(); } -void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); if (!mPlayer.play()) @@ -56,19 +56,19 @@ void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException } } -void SAL_CALL VLCPlayer::stop() throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::stop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); mPlayer.pause(); } -::sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( ::com::sun::star::uno::RuntimeException ) +::sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return mPlayer.isPlaying(); } -double SAL_CALL VLCPlayer::getDuration() throw ( ::com::sun::star::uno::RuntimeException ) +double SAL_CALL VLCPlayer::getDuration() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return static_cast( mMedia.getDuration() ) / MS_IN_SEC; @@ -80,7 +80,7 @@ void SAL_CALL VLCPlayer::setScale( float factor ) mPlayer.setScale( factor ); } -void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); if ( fTime < 0.00000001 && !mPlayer.isPlaying() ) @@ -91,13 +91,13 @@ void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star:: mPlayer.setTime( fTime * MS_IN_SEC ); } -double SAL_CALL VLCPlayer::getMediaTime() throw ( ::com::sun::star::uno::RuntimeException ) +double SAL_CALL VLCPlayer::getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return static_cast( mPlayer.getTime() ) / MS_IN_SEC; } -double SAL_CALL VLCPlayer::getRate() throw ( ::com::sun::star::uno::RuntimeException ) +double SAL_CALL VLCPlayer::getRate() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return mPlayer.getRate(); @@ -111,7 +111,7 @@ void VLCPlayer::replay() start(); } -void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); mPlaybackLoop = bSet; @@ -122,37 +122,37 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun:: mEventManager.onEndReached(); } -::sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException ) +::sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return mPlaybackLoop; } -void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); mPlayer.setVolume( static_cast( ( nDB + 40 ) * 10.0 / 4 ) ); } -::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException ) +::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return static_cast( mPlayer.getVolume() / 10.0 * 4 - 40 ); } -void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException ) +void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); mPlayer.setMute( bSet ); } -::sal_Bool SAL_CALL VLCPlayer::isMute() throw ( ::com::sun::star::uno::RuntimeException ) +::sal_Bool SAL_CALL VLCPlayer::isMute() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); return mPlayer.getMute(); } -css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException ) +css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return css::awt::Size( 480, 360 ); } @@ -203,7 +203,7 @@ void VLCPlayer::setVideoSize( unsigned width, unsigned height ) } uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -226,7 +226,7 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind } uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -240,19 +240,19 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb } ::rtl::OUString SAL_CALL VLCPlayer::getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME; } ::sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName ) - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException ) + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_VLC_PLAYER_SERVICENAME; diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx index d7c5e3e1c312..f5059a1fb55a 100644 --- a/avmedia/source/vlc/vlcplayer.hxx +++ b/avmedia/source/vlc/vlcplayer.hxx @@ -62,31 +62,31 @@ public: void SAL_CALL setScale( float factor ); void SAL_CALL setWindowID( const intptr_t windowID ); - void SAL_CALL start() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL stop() throw ( ::com::sun::star::uno::RuntimeException ); - ::sal_Bool SAL_CALL isPlaying() throw ( ::com::sun::star::uno::RuntimeException ); - double SAL_CALL getDuration() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException ); - double SAL_CALL getMediaTime() throw ( ::com::sun::star::uno::RuntimeException ); - double SAL_CALL getRate() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException ); - ::sal_Bool SAL_CALL isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException ); - ::sal_Int16 SAL_CALL getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException ); - void SAL_CALL setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException ); - ::sal_Bool SAL_CALL isMute() throw ( ::com::sun::star::uno::RuntimeException ); - css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException ); + void SAL_CALL start() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL stop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + ::sal_Bool SAL_CALL isPlaying() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + double SAL_CALL getDuration() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + double SAL_CALL getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + double SAL_CALL getRate() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + ::sal_Bool SAL_CALL isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + ::sal_Int16 SAL_CALL getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + ::sal_Bool SAL_CALL isMute() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::com::sun::star::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::com::sun::star::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::rtl::OUString SAL_CALL getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) - throw ( ::com::sun::star::uno::RuntimeException );; + throw ( ::com::sun::star::uno::RuntimeException, std::exception );; ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw ( ::com::sun::star::uno::RuntimeException );; + throw ( ::com::sun::star::uno::RuntimeException, std::exception );; private: void replay(); diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx index 65fbf6e323ef..cb20ed182860 100644 --- a/avmedia/source/vlc/vlcwindow.cxx +++ b/avmedia/source/vlc/vlcwindow.cxx @@ -27,11 +27,11 @@ VLCWindow::~VLCWindow() mPlayer.setWindowID( mPrevWinID ); } -void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException) +void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException, std::exception) { } -::sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) throw (css::uno::RuntimeException, std::exception) { sal_Bool bRet = false; @@ -63,48 +63,48 @@ void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException) return bRet; } -css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel() throw (css::uno::RuntimeException) +css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel() throw (css::uno::RuntimeException, std::exception) { return meZoomLevel; } -void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 ) throw (css::uno::RuntimeException) +void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 ) throw (css::uno::RuntimeException, std::exception) { } -::rtl::OUString SAL_CALL VLCWindow::getImplementationName() throw (css::uno::RuntimeException) +::rtl::OUString SAL_CALL VLCWindow::getImplementationName() throw (css::uno::RuntimeException, std::exception) { return AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME; } -::sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } -uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() throw (css::uno::RuntimeException) +uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = AVMEDIA_VLC_WINDOW_SERVICENAME; return aRet; } -void SAL_CALL VLCWindow::dispose() throw (uno::RuntimeException) +void SAL_CALL VLCWindow::dispose() throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { mSize.X = X; mSize.Y = Y; @@ -113,83 +113,83 @@ void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, } awt::Rectangle SAL_CALL VLCWindow::getPosSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return mSize; } void SAL_CALL VLCWindow::setVisible( sal_Bool ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::setEnable( sal_Bool ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::setFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx index 022a1b580791..0d07ab434f89 100644 --- a/avmedia/source/vlc/vlcwindow.hxx +++ b/avmedia/source/vlc/vlcwindow.hxx @@ -36,36 +36,36 @@ public: VLCWindow( VLCPlayer& player, const intptr_t prevWinID ); virtual ~VLCWindow(); - void SAL_CALL update() throw (css::uno::RuntimeException); - ::sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException); - css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException); - void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException); + void SAL_CALL update() throw (css::uno::RuntimeException, std::exception); + ::sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception); + css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception); + void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception); - ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); + ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception); + ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception); + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); - void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL setFocus() throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL setFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 691295074564..cfa9eb3d79d1 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -279,7 +279,7 @@ void AccessibleDialogControlShape::disposing() // XEventListener -void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (RuntimeException) +void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (RuntimeException, std::exception) { if ( m_xControlModel.is() ) m_xControlModel->removePropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); @@ -290,7 +290,7 @@ void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw ( // XPropertyChangeListener -void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEvent& rEvent ) throw (RuntimeException) +void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEvent& rEvent ) throw (RuntimeException, std::exception) { if ( rEvent.PropertyName == DLGED_PROP_NAME ) { @@ -312,17 +312,17 @@ void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEv } // XServiceInfo -OUString AccessibleDialogControlShape::getImplementationName() throw (RuntimeException) +OUString AccessibleDialogControlShape::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.basctl.AccessibleShape" ); } -sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rServiceName ) throw (RuntimeException) +sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.drawing.AccessibleShape" ; @@ -330,7 +330,7 @@ Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() th } // XAccessible -Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleContext( ) throw (RuntimeException) +Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleContext( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -338,7 +338,7 @@ Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleConte } // XAccessibleContext -sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -347,7 +347,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (Runtime -Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -359,7 +359,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_I -Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -372,7 +372,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) t -sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -404,7 +404,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (Ru -sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -413,7 +413,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeExce -OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException) +OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -422,7 +422,7 @@ OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (Runti -OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeException) +OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -431,7 +431,7 @@ OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeExcep -Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -442,7 +442,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleR -Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet( ) throw (RuntimeException) +Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -463,7 +463,7 @@ Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStat -Locale AccessibleDialogControlShape::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) +Locale AccessibleDialogControlShape::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -474,7 +474,7 @@ Locale AccessibleDialogControlShape::getLocale( ) throw (IllegalAccessibleCompo // XAccessibleComponent -Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) +Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -483,14 +483,14 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( con -void AccessibleDialogControlShape::grabFocus( ) throw (RuntimeException) +void AccessibleDialogControlShape::grabFocus( ) throw (RuntimeException, std::exception) { // no focus for shapes } -sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeException) +sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -516,7 +516,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeExceptio -sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeException) +sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -537,7 +537,7 @@ sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeExceptio // XAccessibleExtendedComponent -Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (RuntimeException) +Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -564,7 +564,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime -OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeException) +OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -573,7 +573,7 @@ OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeExc -OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeException) +OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 19240ee72602..cf6cf626c5fb 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -608,17 +608,17 @@ void AccessibleDialogWindow::disposing() } // XServiceInfo -OUString AccessibleDialogWindow::getImplementationName() throw (RuntimeException) +OUString AccessibleDialogWindow::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.basctl.AccessibleWindow" ); } -sal_Bool AccessibleDialogWindow::supportsService( const OUString& rServiceName ) throw (RuntimeException) +sal_Bool AccessibleDialogWindow::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > AccessibleDialogWindow::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > AccessibleDialogWindow::getSupportedServiceNames() throw (RuntimeException, std::exception) { Sequence< OUString > aNames(1); aNames[0] = "com.sun.star.awt.AccessibleWindow" ; @@ -626,7 +626,7 @@ Sequence< OUString > AccessibleDialogWindow::getSupportedServiceNames() throw (R } // XAccessible -Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext( ) throw (RuntimeException) +Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -634,7 +634,7 @@ Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext( ) } // XAccessibleContext -sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeException) +sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -643,7 +643,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeExcept -Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -671,7 +671,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i -Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw (RuntimeException) +Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -688,7 +688,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw ( -sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeException) +sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -715,7 +715,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeE -sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException) +sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -724,7 +724,7 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException) -OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeException) +OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -737,7 +737,7 @@ OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeExce -OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException) +OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -750,7 +750,7 @@ OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException) -Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelationSet( ) throw (RuntimeException) +Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -761,7 +761,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelatio -Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet( ) throw (RuntimeException) +Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -782,7 +782,7 @@ Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet( -Locale AccessibleDialogWindow::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) +Locale AccessibleDialogWindow::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -793,7 +793,7 @@ Locale AccessibleDialogWindow::getLocale( ) throw (IllegalAccessibleComponentSt // XAccessibleComponent -Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) +Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -822,7 +822,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt -void AccessibleDialogWindow::grabFocus( ) throw (RuntimeException) +void AccessibleDialogWindow::grabFocus( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -832,7 +832,7 @@ void AccessibleDialogWindow::grabFocus( ) throw (RuntimeException) -sal_Int32 AccessibleDialogWindow::getForeground( ) throw (RuntimeException) +sal_Int32 AccessibleDialogWindow::getForeground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -857,7 +857,7 @@ sal_Int32 AccessibleDialogWindow::getForeground( ) throw (RuntimeException) -sal_Int32 AccessibleDialogWindow::getBackground( ) throw (RuntimeException) +sal_Int32 AccessibleDialogWindow::getBackground( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -877,7 +877,7 @@ sal_Int32 AccessibleDialogWindow::getBackground( ) throw (RuntimeException) // XAccessibleExtendedComponent -Reference< awt::XFont > AccessibleDialogWindow::getFont( ) throw (RuntimeException) +Reference< awt::XFont > AccessibleDialogWindow::getFont( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -903,7 +903,7 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont( ) throw (RuntimeExcept -OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException) +OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -912,7 +912,7 @@ OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException -OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException) +OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -927,7 +927,7 @@ OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException) // XAccessibleSelection -void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -947,7 +947,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) thro -sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -973,7 +973,7 @@ void AccessibleDialogWindow::clearAccessibleSelection() -void AccessibleDialogWindow::selectAllAccessibleChildren( ) throw (RuntimeException) +void AccessibleDialogWindow::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -983,7 +983,7 @@ void AccessibleDialogWindow::selectAllAccessibleChildren( ) throw (RuntimeExcep -sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (RuntimeException) +sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -1000,7 +1000,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (Run -Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -1023,7 +1023,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal -void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) +void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index 48be546eac97..c7728edd57fc 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -94,7 +94,7 @@ Printer* Renderable::getPrinter() sal_Int32 SAL_CALL Renderable::getRendererCount ( const Any&, const Sequence& i_xOptions - ) throw (lang::IllegalArgumentException, RuntimeException) + ) throw (lang::IllegalArgumentException, RuntimeException, std::exception) { processProperties( i_xOptions ); @@ -126,7 +126,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount ( Sequence SAL_CALL Renderable::getRenderer ( sal_Int32, const Any&, const Sequence& i_xOptions - ) throw (lang::IllegalArgumentException, RuntimeException) + ) throw (lang::IllegalArgumentException, RuntimeException, std::exception) { processProperties( i_xOptions ); @@ -154,7 +154,7 @@ Sequence SAL_CALL Renderable::getRenderer ( void SAL_CALL Renderable::render ( sal_Int32 nRenderer, const Any&, const Sequence& i_xOptions - ) throw (lang::IllegalArgumentException, RuntimeException) + ) throw (lang::IllegalArgumentException, RuntimeException, std::exception) { processProperties( i_xOptions ); diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx index 076fea757184..8b6f800bf977 100644 --- a/basctl/source/basicide/basicrenderable.hxx +++ b/basctl/source/basicide/basicrenderable.hxx @@ -45,19 +45,19 @@ public: virtual sal_Int32 SAL_CALL getRendererCount ( const com::sun::star::uno::Any& aSelection, const com::sun::star::uno::Sequence& xOptions) - throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence SAL_CALL getRenderer ( sal_Int32 nRenderer, const com::sun::star::uno::Any& rSelection, const com::sun::star::uno::Sequence& rxOptions) - throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL render ( sal_Int32 nRenderer, const com::sun::star::uno::Any& rSelection, const com::sun::star::uno::Sequence& rxOptions) - throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException); + throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 2e20d098c6f2..233bb6550408 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -196,14 +196,14 @@ public: private: virtual ~ChangesListener() {} - virtual void SAL_CALL disposing(lang::EventObject const &) throw (RuntimeException) + virtual void SAL_CALL disposing(lang::EventObject const &) throw (RuntimeException, std::exception) { osl::MutexGuard g(editor_.mutex_); editor_.notifier_.clear(); } virtual void SAL_CALL propertiesChange( - Sequence< beans::PropertyChangeEvent > const &) throw (RuntimeException) + Sequence< beans::PropertyChangeEvent > const &) throw (RuntimeException, std::exception) { SolarMutexGuard g; editor_.ImplSetFont(); diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx index 0335269819b0..12bf5ae5856c 100644 --- a/basctl/source/basicide/basidectrlr.cxx +++ b/basctl/source/basicide/basidectrlr.cxx @@ -58,7 +58,7 @@ Controller::~Controller() { } // XInterface -Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aReturn = SfxBaseController::queryInterface( rType ); if ( !aReturn.hasValue() ) @@ -78,7 +78,7 @@ void SAL_CALL Controller::release() throw() } // XTypeProvider ( ::SfxBaseController ) -Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException) +Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::exception) { Sequence< Type > aTypes = ::comphelper::concatSequences( SfxBaseController::getTypes(), @@ -88,7 +88,7 @@ Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException) return aTypes; } -Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeException) +Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeException, std::exception) { static ::cppu::OImplementationId * pId = 0; if ( !pId ) @@ -104,7 +104,7 @@ Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeExc } // XPropertySet -Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() throw(RuntimeException) +Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() throw(RuntimeException, std::exception) { Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index ad98344a703d..1581ee7ed5f7 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -105,17 +105,17 @@ public: } // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException ) {} + virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) {} // XContainerListener - virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException ) + virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception ) { OUString sModuleName; if( mpShell && ( Event.Accessor >>= sModuleName ) ) mpShell->FindBasWin( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, true, false ); } - virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( com::sun::star::uno::RuntimeException ) { } - virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( com::sun::star::uno::RuntimeException, std::exception ) { } + virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( com::sun::star::uno::RuntimeException, std::exception ) { OUString sModuleName; if( mpShell && ( Event.Accessor >>= sModuleName ) ) diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index 1037da1760a9..f64a4be4d85b 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -74,10 +74,10 @@ namespace basctl ~Impl (); // XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException); + virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const csslang::EventObject& Event ) throw (RuntimeException); + virtual void SAL_CALL disposing( const csslang::EventObject& Event ) throw (RuntimeException, std::exception); // ComponentHelper virtual void SAL_CALL disposing(); @@ -116,7 +116,7 @@ namespace basctl } } - void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent ) throw (RuntimeException) + void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent ) throw (RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -169,7 +169,7 @@ namespace basctl } } - void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException) + void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index ae356ed80632..dc419081e548 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -85,7 +85,7 @@ class DummyInteractionHandler : public HandlerImpl_BASE public: DummyInteractionHandler( const Reference< task::XInteractionHandler2 >& xHandler ) : m_xHandler( xHandler ){} - virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if ( m_xHandler.is() ) { @@ -1122,19 +1122,19 @@ public: // Methods virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() - throw(RuntimeException); + throw(RuntimeException, std::exception); }; Reference< task::XInteractionHandler > OLibCommandEnvironment::getInteractionHandler() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mxInteraction; } Reference< XProgressHandler > OLibCommandEnvironment::getProgressHandler() - throw(RuntimeException) + throw(RuntimeException, std::exception) { Reference< XProgressHandler > xRet; return xRet; diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index 1f354122ef2b..ddd684f7151b 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -46,7 +46,7 @@ SIDEModel::~SIDEModel() { } -uno::Any SAL_CALL SIDEModel::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException) +uno::Any SAL_CALL SIDEModel::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) { uno::Any aRet = ::cppu::queryInterface ( rType, // OWeakObject interfaces @@ -70,7 +70,7 @@ void SAL_CALL SIDEModel::release() throw() OWeakObject::release(); } -uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) throw(uno::RuntimeException) +uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) throw(uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes = SfxBaseModel::getTypes(); sal_Int32 nLen = aTypes.getLength(); @@ -81,7 +81,7 @@ uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) throw(uno::RuntimeEx return aTypes; } -OUString SIDEModel::getImplementationName(void) throw( uno::RuntimeException ) +OUString SIDEModel::getImplementationName(void) throw( uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -91,11 +91,11 @@ OUString SIDEModel::getImplementationName_Static() return OUString( "com.sun.star.comp.basic.BasicIDE" ); } -sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) +sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SIDEModel::getSupportedServiceNames(void) throw( uno::RuntimeException ) +uno::Sequence< OUString > SIDEModel::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } @@ -118,20 +118,20 @@ uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance( } // XStorable -void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException) +void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException, std::exception) { notImplemented(); } void SAL_CALL SIDEModel::storeAsURL( const OUString&, const uno::Sequence< beans::PropertyValue >& ) - throw (io::IOException, uno::RuntimeException) + 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) + throw (io::IOException, uno::RuntimeException, std::exception) { notImplemented(); } diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index 46b9f2fa8183..6d38b19accfd 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -35,31 +35,31 @@ public: virtual ~SIDEModel(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( ) throw(); virtual void SAL_CALL release( ) throw(); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XStorable2 virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { notImplemented(); } + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { notImplemented(); } // XStorable - virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeAsURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeToURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); static OUString getImplementationName_Static(); diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx index dbef9d595db4..892dcde61643 100644 --- a/basctl/source/dlged/dlgedclip.cxx +++ b/basctl/source/dlged/dlgedclip.cxx @@ -61,7 +61,7 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, c } // XTransferable -Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException) +Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception) { 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) +Sequence< DataFlavor > SAL_CALL DlgEdTransferableImpl::getTransferDataFlavors( ) throw(RuntimeException, std::exception) { const SolarMutexGuard aGuard; return m_SeqFlavors; } -sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor& rFlavor ) throw(RuntimeException) +sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor& rFlavor ) throw(RuntimeException, std::exception) { 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) +void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw(RuntimeException, std::exception) { const SolarMutexGuard aGuard; diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx index ad871511cd30..4a4c290fa7e5 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 ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdPropListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception) { } // XPropertyChangeListener -void SAL_CALL DlgEdPropListenerImpl::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdPropListenerImpl::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException, std::exception) { rDlgEdObj._propertyChange( evt ); } @@ -55,22 +55,22 @@ DlgEdEvtContListenerImpl::~DlgEdEvtContListenerImpl() } // XEventListener -void SAL_CALL DlgEdEvtContListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdEvtContListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception) { } // XContainerListener -void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) { rDlgEdObj._elementInserted( Event ); } -void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) { rDlgEdObj._elementReplaced( Event ); } -void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) { rDlgEdObj._elementRemoved( Event ); } diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index b50537cd701c..4d424d101f28 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -97,41 +97,41 @@ public: DECLARE_XTYPEPROVIDER() // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace basctl diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index bc0f065ca101..597ed7d89cea 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -122,46 +122,46 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearAccessibleSelection() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace basctl diff --git a/basctl/source/inc/basidectrlr.hxx b/basctl/source/inc/basidectrlr.hxx index feac8229c16e..0507f95e965c 100644 --- a/basctl/source/inc/basidectrlr.hxx +++ b/basctl/source/inc/basidectrlr.hxx @@ -45,16 +45,16 @@ public: virtual ~Controller(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XTypeProvider ( ::SfxBaseController ) - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx index a97128a72594..af9bbe8a9fba 100644 --- a/basctl/source/inc/dlgedclip.hxx +++ b/basctl/source/inc/dlgedclip.hxx @@ -46,12 +46,12 @@ public: virtual ~DlgEdTransferableImpl(); // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XClipboardOwner - virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace basctl diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx index 9c5a97609a44..5ceb834a3e0e 100644 --- a/basctl/source/inc/dlgedlist.hxx +++ b/basctl/source/inc/dlgedlist.hxx @@ -45,10 +45,10 @@ public: virtual ~DlgEdPropListenerImpl(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; @@ -68,12 +68,12 @@ public: virtual ~DlgEdEvtContListenerImpl(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace basctl diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx index 38535ab05735..7e6230945fc9 100644 --- a/basegfx/source/tools/unopolypolygon.cxx +++ b/basegfx/source/tools/unopolypolygon.cxx @@ -52,7 +52,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::addPolyPolygon( const geometry::RealPoint2D& position, - const uno::Reference< rendering::XPolyPolygon2D >& polyPolygon ) throw (lang::IllegalArgumentException,uno::RuntimeException) + const uno::Reference< rendering::XPolyPolygon2D >& polyPolygon ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -130,14 +130,14 @@ namespace unotools maPolyPoly.append( aSrcPoly ); } - sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygons() throw (uno::RuntimeException) + sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygons() throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); return maPolyPoly.count(); } sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygonPoints( - sal_Int32 polygon ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException) + sal_Int32 polygon ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); checkIndex( polygon ); @@ -145,14 +145,14 @@ namespace unotools return maPolyPoly.getB2DPolygon(polygon).count(); } - rendering::FillRule SAL_CALL UnoPolyPolygon::getFillRule() throw (uno::RuntimeException) + rendering::FillRule SAL_CALL UnoPolyPolygon::getFillRule() throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); return meFillRule; } void SAL_CALL UnoPolyPolygon::setFillRule( - rendering::FillRule fillRule ) throw (uno::RuntimeException) + rendering::FillRule fillRule ) throw (uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -161,7 +161,7 @@ namespace unotools } sal_Bool SAL_CALL UnoPolyPolygon::isClosed( - sal_Int32 index ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException) + sal_Int32 index ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); checkIndex( index ); @@ -171,7 +171,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setClosed( sal_Int32 index, - sal_Bool closedState ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException) + sal_Bool closedState ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -198,7 +198,7 @@ namespace unotools sal_Int32 nPolygonIndex, sal_Int32 nNumberOfPolygons, sal_Int32 nPointIndex, - sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException) + sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); @@ -211,7 +211,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setPoints( const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points, - sal_Int32 nPolygonIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException) + sal_Int32 nPolygonIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -233,7 +233,7 @@ namespace unotools geometry::RealPoint2D SAL_CALL UnoPolyPolygon::getPoint( sal_Int32 nPolygonIndex, - sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException) + sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); checkIndex( nPolygonIndex ); @@ -249,7 +249,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setPoint( const geometry::RealPoint2D& point, sal_Int32 nPolygonIndex, - sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException) + sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); checkIndex( nPolygonIndex ); @@ -269,7 +269,7 @@ namespace unotools sal_Int32 nPolygonIndex, sal_Int32 nNumberOfPolygons, sal_Int32 nPointIndex, - sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); return unotools::bezierSequenceSequenceFromB2DPolyPolygon( @@ -282,7 +282,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setBezierSegments( const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >& points, sal_Int32 nPolygonIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -303,7 +303,7 @@ namespace unotools geometry::RealBezierSegment2D SAL_CALL UnoPolyPolygon::getBezierSegment( sal_Int32 nPolygonIndex, sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); checkIndex( nPolygonIndex ); @@ -329,7 +329,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setBezierSegment( const geometry::RealBezierSegment2D& segment, sal_Int32 nPolygonIndex, sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { osl::MutexGuard const guard( m_aMutex ); checkIndex( nPolygonIndex ); @@ -437,17 +437,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 ) + OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( IMPLEMENTATION_NAME ); } - sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL UnoPolyPolygon::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL UnoPolyPolygon::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = SERVICE_NAME ; diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 3a79a7460e53..0718391941e7 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -158,15 +158,15 @@ public: // XEventListener virtual void SAL_CALL disposing( const lang::EventObject& Source ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // XContainerListener virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); }; @@ -245,7 +245,7 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr, void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& Source ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { (void)Source; } @@ -254,7 +254,7 @@ void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& S void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::ContainerEvent& Event ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { bool bLibContainer = maLibName.isEmpty(); OUString aName; @@ -301,7 +301,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::Con void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::ContainerEvent& Event ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { OUString aName; Event.Accessor >>= aName; @@ -331,7 +331,7 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::Con void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const container::ContainerEvent& Event ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { OUString aName; Event.Accessor >>= aName; @@ -1858,11 +1858,11 @@ public: : maName( aName ), maLanguage( aLanguage), maSource( aSource ) {} // Methods XStarBasicModuleInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException) + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) { return maName; } - virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException) + virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException, std::exception) { return maLanguage; } - virtual OUString SAL_CALL getSource() throw(uno::RuntimeException) + virtual OUString SAL_CALL getSource() throw(uno::RuntimeException, std::exception) { return maSource; } }; @@ -1879,9 +1879,9 @@ public: : maName( aName ), mData( Data ) {} // Methods XStarBasicDialogInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException) + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) { return maName; } - virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException) + virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException, std::exception) { return mData; } }; @@ -1916,17 +1916,17 @@ public: {} // Methods XStarBasicLibraryInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException) + virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) { return maName; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException) + virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException, std::exception) { return mxModuleContainer; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException) + virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException, std::exception) { return mxDialogContainer; } - virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException) + virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException, std::exception) { return maPassword; } - virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException) + virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException, std::exception) { return maExternaleSourceURL; } - virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException) + virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException, std::exception) { return maLinkTargetURL; } }; @@ -1942,41 +1942,41 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException); + lang::WrappedTargetException, uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException); + lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); }; // Methods XElementAccess uno::Type ModuleContainer_Impl::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicModuleInfo > *)0 ); return aModuleType; } sal_Bool ModuleContainer_Impl::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SbxArray* pMods = mpLib ? mpLib->GetModules() : NULL; return pMods && pMods->Count() > 0; @@ -1984,7 +1984,7 @@ sal_Bool ModuleContainer_Impl::hasElements() // Methods XNameAccess uno::Any ModuleContainer_Impl::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : NULL; if( !pMod ) @@ -1997,7 +1997,7 @@ uno::Any ModuleContainer_Impl::getByName( const OUString& aName ) } uno::Sequence< OUString > ModuleContainer_Impl::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SbxArray* pMods = mpLib ? mpLib->GetModules() : NULL; sal_uInt16 nMods = pMods ? pMods->Count() : 0; @@ -2012,7 +2012,7 @@ uno::Sequence< OUString > ModuleContainer_Impl::getElementNames() } sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : NULL; sal_Bool bRet = (pMod != NULL); @@ -2022,7 +2022,7 @@ 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) + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -2031,7 +2031,7 @@ 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) + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicModuleInfo > *)0 ); uno::Type aAnyType = aElement.getValueType(); @@ -2045,7 +2045,7 @@ void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any& } void ModuleContainer_Impl::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( Name ) : NULL; if( !pMod ) @@ -2093,39 +2093,39 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException); + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); }; // Methods XElementAccess uno::Type DialogContainer_Impl::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicDialogInfo > *)0 ); return aModuleType; } sal_Bool DialogContainer_Impl::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Bool bRet = sal_False; @@ -2145,7 +2145,7 @@ sal_Bool DialogContainer_Impl::hasElements() // Methods XNameAccess uno::Any DialogContainer_Impl::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE ); if( !( pVar && pVar->ISA( SbxObject ) && @@ -2164,7 +2164,7 @@ uno::Any DialogContainer_Impl::getByName( const OUString& aName ) } uno::Sequence< OUString > DialogContainer_Impl::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { mpLib->GetAll( SbxCLASS_OBJECT ); sal_Int16 nCount = mpLib->GetObjects()->Count(); @@ -2186,7 +2186,7 @@ uno::Sequence< OUString > DialogContainer_Impl::getElementNames() } sal_Bool DialogContainer_Impl::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Bool bRet = sal_False; SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxCLASS_DONTCARE ); @@ -2201,7 +2201,7 @@ 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) + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -2210,7 +2210,7 @@ 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) + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)aName; uno::Type aModuleType = ::getCppuType( (const uno::Reference< script::XStarBasicDialogInfo > *)0 ); @@ -2226,7 +2226,7 @@ void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any& } void DialogContainer_Impl::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)Name; SbxVariable* pVar = mpLib->GetObjects()->Find( Name, SbxCLASS_DONTCARE ); @@ -2252,40 +2252,40 @@ public: // Methods XElementAccess virtual uno::Type SAL_CALL getElementType() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException); + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); }; // Methods XElementAccess uno::Type LibraryContainer_Impl::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Type aType = ::getCppuType( (const uno::Reference< script::XStarBasicLibraryInfo > *)0 ); return aType; } sal_Bool LibraryContainer_Impl::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Int32 nLibs = mpMgr->GetLibCount(); sal_Bool bRet = (nLibs > 0); @@ -2294,7 +2294,7 @@ sal_Bool LibraryContainer_Impl::hasElements() // Methods XNameAccess uno::Any LibraryContainer_Impl::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRetAny; if( !mpMgr->HasLib( aName ) ) @@ -2337,7 +2337,7 @@ uno::Any LibraryContainer_Impl::getByName( const OUString& aName ) } uno::Sequence< OUString > LibraryContainer_Impl::getElementNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_uInt16 nLibs = mpMgr->GetLibCount(); uno::Sequence< OUString > aRetSeq( nLibs ); @@ -2350,7 +2350,7 @@ uno::Sequence< OUString > LibraryContainer_Impl::getElementNames() } sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { sal_Bool bRet = mpMgr->HasLib( aName ); return bRet; @@ -2358,7 +2358,7 @@ 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) + throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -2366,7 +2366,7 @@ 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) + throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)aName; (void)aElement; @@ -2374,7 +2374,7 @@ void LibraryContainer_Impl::insertByName( const OUString& aName, const uno::Any& } void LibraryContainer_Impl::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { StarBASIC* pLib = mpMgr->GetLib( Name ); if( !pLib ) @@ -2402,20 +2402,20 @@ public: public: // Methods virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password, const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(container::ElementExistException, uno::RuntimeException); + throw(container::ElementExistException, uno::RuntimeException, std::exception); virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName, const OUString& Language, const OUString& Source ) - throw(container::NoSuchElementException, uno::RuntimeException); + throw(container::NoSuchElementException, uno::RuntimeException, std::exception); virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName, const uno::Sequence< sal_Int8 >& Data ) - throw(container::NoSuchElementException, uno::RuntimeException); + throw(container::NoSuchElementException, uno::RuntimeException, std::exception); }; uno::Reference< container::XNameContainer > SAL_CALL StarBasicAccess_Impl::getLibraryContainer() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( !mxLibContainer.is() ) mxLibContainer = (container::XNameContainer*)new LibraryContainer_Impl( mpMgr ); @@ -2429,7 +2429,7 @@ void SAL_CALL StarBasicAccess_Impl::createLibrary const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(container::ElementExistException, uno::RuntimeException) + throw(container::ElementExistException, uno::RuntimeException, std::exception) { (void)ExternalSourceURL; #ifdef DBG_UTIL @@ -2446,7 +2446,7 @@ void SAL_CALL StarBasicAccess_Impl::addModule const OUString& Language, const OUString& Source ) - throw(container::NoSuchElementException, uno::RuntimeException) + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { (void)Language; StarBASIC* pLib = mpMgr->GetLib( LibraryName ); @@ -2463,7 +2463,7 @@ void SAL_CALL StarBasicAccess_Impl::addDialog const OUString& DialogName, const uno::Sequence< sal_Int8 >& Data ) - throw(container::NoSuchElementException, uno::RuntimeException) + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { (void)LibraryName; (void)DialogName; diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx index 7434ba56a36a..b1af39fb979f 100644 --- a/basic/source/basmgr/vbahelper.cxx +++ b/basic/source/basmgr/vbahelper.cxx @@ -56,8 +56,8 @@ class DocumentsEnumeration : public ::cppu::WeakImplHelper1< container::XEnumera { public: DocumentsEnumeration( const uno::Reference< frame::XModel >& rxModel ); - virtual sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException); - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + virtual sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception); + virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); private: typedef ::std::vector< uno::Reference< frame::XModel > > ModelVector; ModelVector maModels; @@ -86,12 +86,12 @@ DocumentsEnumeration::DocumentsEnumeration( const uno::Reference< frame::XModel maModelIt = maModels.begin(); } -sal_Bool SAL_CALL DocumentsEnumeration::hasMoreElements() throw (uno::RuntimeException) +sal_Bool SAL_CALL DocumentsEnumeration::hasMoreElements() throw (uno::RuntimeException, std::exception) { return maModelIt != maModels.end(); } -uno::Any SAL_CALL DocumentsEnumeration::nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) +uno::Any SAL_CALL DocumentsEnumeration::nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( maModelIt == maModels.end() ) throw container::NoSuchElementException(); diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index 4043549be109..1eec72926949 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -41,22 +41,22 @@ public: ErrObject(); ~ErrObject(); // Attributes - virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException); - virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException); - virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException); - virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException); - virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException); - virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException); - virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException); - virtual OUString SAL_CALL getSource() throw (uno::RuntimeException); - virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSource() throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception); // Methods - virtual void SAL_CALL Clear( ) throw (uno::RuntimeException); - 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); + virtual void SAL_CALL Clear( ) throw (uno::RuntimeException, std::exception); + 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); // XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException); + virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception); // Helper method void setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, @@ -73,13 +73,13 @@ ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0) } sal_Int32 SAL_CALL -ErrObject::getNumber() throw (uno::RuntimeException) +ErrObject::getNumber() throw (uno::RuntimeException, std::exception) { return m_nNumber; } void SAL_CALL -ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException) +ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) { GetSbData()->pInst->setErrorVB( _number, OUString() ); OUString _description = GetSbData()->pInst->GetErrorMsg(); @@ -87,55 +87,55 @@ ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException) } ::sal_Int32 SAL_CALL -ErrObject::getHelpContext() throw (uno::RuntimeException) +ErrObject::getHelpContext() throw (uno::RuntimeException, std::exception) { return m_nHelpContext; } void SAL_CALL -ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException) +ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception) { m_nHelpContext = _helpcontext; } OUString SAL_CALL -ErrObject::getHelpFile() throw (uno::RuntimeException) +ErrObject::getHelpFile() throw (uno::RuntimeException, std::exception) { return m_sHelpFile; } void SAL_CALL -ErrObject::setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException) +ErrObject::setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception) { m_sHelpFile = _helpfile; } OUString SAL_CALL -ErrObject::getDescription() throw (uno::RuntimeException) +ErrObject::getDescription() throw (uno::RuntimeException, std::exception) { return m_sDescription; } void SAL_CALL -ErrObject::setDescription( const OUString& _description ) throw (uno::RuntimeException) +ErrObject::setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception) { m_sDescription = _description; } OUString SAL_CALL -ErrObject::getSource() throw (uno::RuntimeException) +ErrObject::getSource() throw (uno::RuntimeException, std::exception) { return m_sSource; } void SAL_CALL -ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException) +ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception) { m_sSource = _source; } // Methods void SAL_CALL -ErrObject::Clear( ) throw (uno::RuntimeException) +ErrObject::Clear( ) throw (uno::RuntimeException, std::exception) { m_sHelpFile = OUString(); m_sSource = m_sHelpFile; @@ -145,7 +145,7 @@ ErrObject::Clear( ) throw (uno::RuntimeException) } 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) +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) { setData( Number, Source, Description, HelpFile, HelpContext ); if ( m_nNumber ) @@ -154,7 +154,7 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any // XDefaultProperty OUString SAL_CALL -ErrObject::getDefaultPropertyName( ) throw (uno::RuntimeException) +ErrObject::getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) { static OUString sDfltPropName( "Number" ); return sDfltPropName; diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index b9d44ac26139..39b43108a02c 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -155,23 +155,23 @@ public: // Methods of XAllListener virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent) - throw( InvocationTargetException, RuntimeException ); + throw( InvocationTargetException, RuntimeException, std::exception ); // Methods of XEventListener virtual void SAL_CALL disposing(const EventObject& Source) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); }; // Methods XAllListener -void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException ) +void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException, std::exception ) { firing_impl( aScriptEvent, NULL ); } Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent ) - throw ( InvocationTargetException, RuntimeException ) + throw ( InvocationTargetException, RuntimeException, std::exception ) { Any aRetAny; firing_impl( aScriptEvent, &aRetAny ); @@ -179,7 +179,7 @@ Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent ) } // Methods XEventListener -void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException ) +void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException, std::exception ) { // TODO: ??? //SolarMutexGuard aGuard; diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 3ca1e296c0a9..0713a72b58fe 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -72,7 +72,7 @@ SbPropertyValues::~SbPropertyValues() -Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw( RuntimeException ) +Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo(void) throw( RuntimeException, std::exception ) { // create on demand? if (!m_xInfo.is()) @@ -108,7 +108,7 @@ void SbPropertyValues::setPropertyValue( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { size_t const nIndex = GetIndex_Impl( aPropertyName ); PropertyValue & rPropVal = m_aPropVals[nIndex]; @@ -121,7 +121,7 @@ Any SbPropertyValues::getPropertyValue( const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { size_t const nIndex = GetIndex_Impl( aPropertyName ); return m_aPropVals[nIndex].Value; @@ -132,7 +132,7 @@ Any SbPropertyValues::getPropertyValue( void SbPropertyValues::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& ) - throw () + throw (std::exception) { (void)aPropertyName; } @@ -142,7 +142,7 @@ void SbPropertyValues::addPropertyChangeListener( void SbPropertyValues::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& ) - throw () + throw (std::exception) { (void)aPropertyName; } @@ -152,7 +152,7 @@ void SbPropertyValues::removePropertyChangeListener( void SbPropertyValues::addVetoableChangeListener( const OUString& aPropertyName, const Reference< XVetoableChangeListener >& ) - throw() + throw(std::exception) { (void)aPropertyName; } @@ -162,14 +162,14 @@ void SbPropertyValues::addVetoableChangeListener( void SbPropertyValues::removeVetoableChangeListener( const OUString& aPropertyName, const Reference< XVetoableChangeListener >& ) - throw() + throw(std::exception) { (void)aPropertyName; } -Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException) +Sequence< PropertyValue > SbPropertyValues::getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception) { Sequence aRet( m_aPropVals.size() ); for (size_t n = 0; n < m_aPropVals.size(); ++n) @@ -184,7 +184,7 @@ void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPrope ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { if ( !m_aPropVals.empty() ) throw PropertyExistException(); @@ -258,19 +258,19 @@ SbPropertySetInfo::~SbPropertySetInfo() -Sequence< Property > SbPropertySetInfo::getProperties(void) throw( RuntimeException ) +Sequence< Property > SbPropertySetInfo::getProperties(void) throw( RuntimeException, std::exception ) { return aImpl.getProperties(); } Property SbPropertySetInfo::getPropertyByName(const OUString& Name) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return aImpl.getPropertyByName( Name ); } sal_Bool SbPropertySetInfo::hasPropertyByName(const OUString& Name) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return aImpl.hasPropertyByName( Name ); } diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index a0ffd4cc3bfc..2620251f83a6 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -80,9 +80,9 @@ public: void startListening(); void stopListening(); - virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException); - virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException); - virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException); + virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception); private: StarBASIC& mrDocBasic; @@ -136,17 +136,17 @@ void DocBasicItem::stopListening() } } -void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException) +void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) { } -void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException) +void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) { stopListening(); mbDocClosed = true; } -void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException) +void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) { stopListening(); } diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 2bc4c57a0ce5..5e21eecb5044 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3907,11 +3907,11 @@ public: ~BasicAllListener_Impl(); // Methods of XAllListener - virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException ); - virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException ); + virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ); + virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException, std::exception ); // Methods of XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException ); + virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception ); }; @@ -3979,12 +3979,12 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet // Methods of Listener -void BasicAllListener_Impl::firing( const AllEventObject& Event ) throw ( RuntimeException ) +void BasicAllListener_Impl::firing( const AllEventObject& Event ) throw ( RuntimeException, std::exception ) { firing_impl( Event, NULL ); } -Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( RuntimeException ) +Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( RuntimeException, std::exception ) { Any aRetAny; firing_impl( Event, &aRetAny ); @@ -3993,7 +3993,7 @@ Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( // Methods of XEventListener -void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException ) +void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException, std::exception ) { SolarMutexGuard guard; @@ -4013,14 +4013,14 @@ public: const Reference< XAllListener >& AllListener, const Any& Helper ); // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException ); + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection(void) throw( RuntimeException, std::exception ); virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) - throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException ); + throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ); virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) - throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException ); - virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException ); - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException ); - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException ); + throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ); + virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ); private: Reference< XIdlReflection > m_xCoreReflection; @@ -4065,7 +4065,7 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection(void) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return Reference< XIntrospectionAccess >(); } @@ -4074,7 +4074,7 @@ 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 ) + InvocationTargetException, RuntimeException, std::exception ) { (void)OutParamIndex; (void)OutParam ; @@ -4127,7 +4127,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyName, const Any& Value) throw( UnknownPropertyException, CannotConvertException, - InvocationTargetException, RuntimeException ) + InvocationTargetException, RuntimeException, std::exception ) { (void)PropertyName; (void)Value; @@ -4135,7 +4135,7 @@ void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyNa Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyName) - throw( UnknownPropertyException, RuntimeException ) + throw( UnknownPropertyException, RuntimeException, std::exception ) { (void)PropertyName; @@ -4144,7 +4144,7 @@ Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyNam sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XIdlMethod > xMethod = m_xListenerType->getMethod( Name ); return xMethod.is(); @@ -4152,7 +4152,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name) sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Name) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XIdlField > xField = m_xListenerType->getField( Name ); return xField.is(); @@ -4352,24 +4352,24 @@ public: {} // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(); + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception); virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue ) - throw( UnknownPropertyException ); + throw( UnknownPropertyException, std::exception ); virtual Any SAL_CALL getValue( const OUString& rProperty ) - throw( UnknownPropertyException ); - virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(); - virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(); + throw( UnknownPropertyException, std::exception ); + virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception); + virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception); virtual Any SAL_CALL invoke( const OUString& rFunction, const Sequence< Any >& rParams, Sequence< sal_Int16 >& rOutParamIndex, Sequence< Any >& rOutParam ) - throw( CannotConvertException, InvocationTargetException ); + throw( CannotConvertException, InvocationTargetException, std::exception ); // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException); - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException); - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException); + virtual void SAL_CALL dispose() throw(RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception); }; ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj ) @@ -4380,12 +4380,12 @@ ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObject m_bProxyIsClassModuleObject = xScopeObj.Is() ? xScopeObj->ISA(SbClassModuleObject) : false; } -Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() throw() +Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() throw(std::exception) { return Reference< XIntrospectionAccess >(); } -void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const Any& rValue ) throw( UnknownPropertyException ) +void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const Any& rValue ) throw( UnknownPropertyException, std::exception ) { if( !m_bProxyIsClassModuleObject ) throw UnknownPropertyException(); @@ -4423,7 +4423,7 @@ void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const } -Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw( UnknownPropertyException ) +Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw( UnknownPropertyException, std::exception ) { if( !m_bProxyIsClassModuleObject ) { @@ -4451,12 +4451,12 @@ Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw( return aRet; } -sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) throw() +sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) throw(std::exception) { return sal_False; } -sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) throw() +sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) throw(std::exception) { return sal_False; } @@ -4465,7 +4465,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction, const Sequence< Any >& rParams, Sequence< sal_Int16 >&, Sequence< Any >& ) - throw( CannotConvertException, InvocationTargetException ) + throw( CannotConvertException, InvocationTargetException, std::exception ) { SolarMutexGuard guard; @@ -4532,7 +4532,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction, } void SAL_CALL ModuleInvocationProxy::dispose() - throw(RuntimeException) + throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4543,13 +4543,13 @@ void SAL_CALL ModuleInvocationProxy::dispose() } void SAL_CALL ModuleInvocationProxy::addEventListener( const Reference< XEventListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_aListeners.addInterface( xListener ); } void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEventListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_aListeners.removeInterface( xListener ); } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 2768ef98b497..ce31d501c647 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -107,23 +107,23 @@ public: virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException) + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) { if( !m_xAggregateTypeProv.is() ) throw RuntimeException(); return m_xAggregateTypeProv->getImplementationId(); } - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (RuntimeException); + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (RuntimeException, std::exception); - virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException); - virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException); - virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException); - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException); - virtual Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException ); + 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); + virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception); + virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException, std::exception ); - virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException ); + virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception ); }; DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ), mName( pVar->GetName() ) @@ -202,7 +202,7 @@ DocObjectWrapper::~DocObjectWrapper() } Sequence< Type > SAL_CALL DocObjectWrapper::getTypes() - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { if ( m_Types.getLength() == 0 ) { @@ -229,13 +229,13 @@ Sequence< Type > SAL_CALL DocObjectWrapper::getTypes() } Reference< XIntrospectionAccess > SAL_CALL -DocObjectWrapper::getIntrospection( ) throw (RuntimeException) +DocObjectWrapper::getIntrospection( ) throw (RuntimeException, std::exception) { return NULL; } Any SAL_CALL -DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException) +DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) { if ( m_xAggInv.is() && m_xAggInv->hasMethod( aFunctionName ) ) return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam ); @@ -329,7 +329,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) +DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) { if ( m_xAggInv.is() && m_xAggInv->hasProperty( aPropertyName ) ) return m_xAggInv->setValue( aPropertyName, aValue ); @@ -341,7 +341,7 @@ DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) t } Any SAL_CALL -DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException) +DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) { if ( m_xAggInv.is() && m_xAggInv->hasProperty( aPropertyName ) ) return m_xAggInv->getValue( aPropertyName ); @@ -359,7 +359,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownProper } ::sal_Bool SAL_CALL -DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException) +DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) { if ( m_xAggInv.is() && m_xAggInv->hasMethod( aName ) ) return sal_True; @@ -367,7 +367,7 @@ DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException) } ::sal_Bool SAL_CALL -DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException) +DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) { sal_Bool bRes = sal_False; if ( m_xAggInv.is() && m_xAggInv->hasProperty( aName ) ) @@ -377,7 +377,7 @@ DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException) } Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { Any aRet = DocObjectWrapper_BASE::queryInterface( aType ); if ( aRet.hasValue() ) @@ -2350,7 +2350,7 @@ public: mxModel.clear(); } - virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) { @@ -2365,7 +2365,7 @@ public: } - virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { #ifdef IN_THE_FUTURE uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY ); @@ -2397,21 +2397,21 @@ public: } - virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { mbOpened = false; mbShowing = false; } - virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { } - virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { } - virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) { @@ -2424,13 +2424,13 @@ public: } } - virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) mpUserForm->triggerDeactivateEvent(); } - virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) { @@ -2439,21 +2439,21 @@ public: } } - virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) { if ( mpUserForm ) mpUserForm->triggerLayoutEvent(); } - virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { } - virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) { } - virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException) + virtual void SAL_CALL notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) { // early dosposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate" if( rEvent.EventName == GlobalEventConfig::GetEventName( STR_EVENT_CLOSEDOC ) ) @@ -2465,7 +2465,7 @@ public: } } - virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) + virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { SAL_INFO("basic", "** Userform/Dialog disposing"); removeListener(); diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index a22fdb872e36..81354edfc29a 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -75,7 +75,7 @@ public: // Methods XStorageBasedLibraryContainer virtual void SAL_CALL storeLibrariesToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& RootStorage ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Resource handling ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourcePersistence > @@ -83,12 +83,12 @@ public: // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XLibraryQueryExecutable virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Service static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(); static OUString getImplementationName_static(); @@ -144,7 +144,7 @@ public: // XStringResourceSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > - SAL_CALL getStringResource( ) throw (::com::sun::star::uno::RuntimeException); + SAL_CALL getStringResource( ) throw (::com::sun::star::uno::RuntimeException, std::exception); OUString getName( void ) { return m_aName; } diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index a2066cf69aa6..38e83f0db2e8 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -98,53 +98,53 @@ public: // Methods XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XChangesNotifier virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -386,145 +386,145 @@ public: // Methods XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Members XStorageBasedLibraryContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getRootStorage() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRootStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rootstorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeLibrariesToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& RootStorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getRootStorage() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRootStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rootstorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL storeLibrariesToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& RootStorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // Methods XModifiable (base of XPersistentLibraryContainer) - virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XPersistentLibraryContainer (base of XStorageBasedLibraryContainer) - virtual ::com::sun::star::uno::Any SAL_CALL getRootLocation() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getContainerLocationName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL storeLibraries( ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getRootLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getContainerLocationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL storeLibraries( ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //Methods XLibraryContainer3 virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XLibraryContainer2 (base of XPersistentLibraryContainer) virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XLibraryContainer (base of XLibraryContainer2) virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL createLibrary( const OUString& Name ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL createLibraryLink ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeLibrary( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL loadLibrary( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XLibraryContainerPassword virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL changeLibraryPassword( const OUString& Name, const OUString& OldPassword, const OUString& NewPassword ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XLibraryContainerExport virtual void SAL_CALL exportLibrary( const OUString& Name, const OUString& URL, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException) = 0; + throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException) = 0; + throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; // Methods XVBACompatibility - virtual ::sal_Bool SAL_CALL getVBACompatibilityMode() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getProjectName() throw (::com::sun::star::uno::RuntimeException) { return msProjectName; } - virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL getVBACompatibilityMode() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getProjectName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return msProjectName; } + virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getRunningVBAScripts() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addVBAScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAScriptListener >& Listener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVBAScriptListener( const ::com::sun::star::uno::Reference< ::com::sun::star::script::vba::XVBAScriptListener >& Listener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -634,65 +634,65 @@ public: ); // Methods XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw() { OComponentHelper::acquire(); } virtual void SAL_CALL release() throw() { OComponentHelper::release(); } // Methods XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // Methods XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // Methods XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XChangesNotifier virtual void SAL_CALL addChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XChangesListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); public: struct LibraryContainerAccess { friend class SfxLibraryContainer; private: LibraryContainerAccess() { } }; diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 0253cb0a217a..23141c641254 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -51,7 +51,7 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException ); + getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) @@ -59,31 +59,31 @@ public: ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (); + throw (std::exception); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (); + throw (std::exception); virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (); + throw (std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (); + throw (std::exception); // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& PropertyValues_) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; @@ -121,11 +121,11 @@ public: // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& Name) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& Name) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 6c2bc5b07538..02b2ba9bdd9a 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -99,28 +99,28 @@ public: // Methods XLibraryContainerPassword virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL changeLibraryPassword( const OUString& Name, const OUString& OldPassword, const OUString& NewPassword ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XLibraryQueryExecutable virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Service static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(); @@ -175,10 +175,10 @@ public: DECLARE_XTYPEPROVIDER() // XVBAModuleInfo - virtual ::com::sun::star::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const ::com::sun::star::script::ModuleInfo& ModuleInfo ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const ::com::sun::star::script::ModuleInfo& ModuleInfo ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); static bool containsValidModule( const ::com::sun::star::uno::Any& _rElement ); diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx index a5372ffdfe1d..4ef346a205ac 100644 --- a/basic/source/runtime/comenumwrapper.cxx +++ b/basic/source/runtime/comenumwrapper.cxx @@ -22,7 +22,7 @@ using namespace ::com::sun::star; ::sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { sal_Bool bResult = sal_False; @@ -43,7 +43,7 @@ using namespace ::com::sun::star; uno::Any SAL_CALL ComEnumerationWrapper::nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { try { diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx index a3b5c0c27a92..0f9992c2b36c 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 (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; #endif // INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 016c0ffdb5f3..532310e542a7 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -186,7 +186,7 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement xInput->closeInput(); } -void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException ) +void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException, std::exception ) { LibraryContainerMethodGuard aGuard( *this ); mbOasis2OOoFormat = false; @@ -443,7 +443,7 @@ void SfxDialogLibraryContainer::onNewRootStorage() } sal_Bool SAL_CALL -SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) throw (uno::RuntimeException) +SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) throw (uno::RuntimeException, std::exception) { return sal_False; // dialog library has no executable code } @@ -455,12 +455,12 @@ void createRegistryInfo_SfxDialogLibraryContainer() static OAutoRegistration< SfxDialogLibraryContainer > aAutoRegistration; } -OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) throw (RuntimeException, std::exception) { return getImplementationName_static(); } -Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -585,7 +585,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const ::com::sun::star::uno::Ref // XStringResourceSupplier Reference< resource::XStringResourceResolver > - SAL_CALL SfxDialogLibrary::getStringResource( ) throw (RuntimeException) + SAL_CALL SfxDialogLibrary::getStringResource( ) throw (RuntimeException, std::exception) { 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 2c3295f90a77..7590e18b55ff 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -98,13 +98,13 @@ static bool GbMigrationSuppressErrors = false; // Methods XElementAccess Type NameContainer::getElementType() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mType; } sal_Bool NameContainer::hasElements() - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Bool bRet = (mnElementCount > 0); return bRet; @@ -112,7 +112,7 @@ sal_Bool NameContainer::hasElements() // Methods XNameAccess Any NameContainer::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); if( aIt == mHashMap.end() ) @@ -125,13 +125,13 @@ Any NameContainer::getByName( const OUString& aName ) } Sequence< OUString > NameContainer::getElementNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mNames; } sal_Bool NameContainer::hasByName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); sal_Bool bRet = ( aIt != mHashMap.end() ); @@ -141,7 +141,7 @@ sal_Bool NameContainer::hasByName( const OUString& aName ) // Methods XNameReplace void NameContainer::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Type aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -188,7 +188,7 @@ void NameContainer::replaceByName( const OUString& aName, const Any& aElement ) // Methods XNameContainer void NameContainer::insertByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Type aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -236,7 +236,7 @@ void NameContainer::insertByName( const OUString& aName, const Any& aElement ) } void NameContainer::removeByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); if( aIt == mHashMap.end() ) @@ -290,7 +290,7 @@ void NameContainer::removeByName( const OUString& aName ) // Methods XContainer void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -301,7 +301,7 @@ void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerLi } void SAL_CALL NameContainer::removeContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -312,7 +312,7 @@ void SAL_CALL NameContainer::removeContainerListener( const Reference< XContaine // Methods XChangesNotifier void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -322,7 +322,7 @@ void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListen } void SAL_CALL NameContainer::removeChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -441,14 +441,14 @@ BasicManager* SfxLibraryContainer::getBasicManager( void ) } // Methods XStorageBasedLibraryContainer -Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage() throw (RuntimeException) +Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage() throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return mxStorage; } void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >& _rxRootStorage ) - throw (IllegalArgumentException, RuntimeException) + throw (IllegalArgumentException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if ( !_rxRootStorage.is() ) @@ -460,7 +460,7 @@ void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >& } void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XStorage >& _rxRootStorage ) - throw (IllegalArgumentException, WrappedTargetException, RuntimeException) + throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if ( !_rxRootStorage.is() ) @@ -481,7 +481,7 @@ void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XSt // Methods XModifiable sal_Bool SfxLibraryContainer::isModified() - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if ( maModifiable.isModified() ) @@ -518,41 +518,41 @@ sal_Bool SfxLibraryContainer::isModified() } void SAL_CALL SfxLibraryContainer::setModified( sal_Bool _bModified ) - throw (PropertyVetoException, RuntimeException) + throw (PropertyVetoException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maModifiable.setModified( _bModified ); } void SAL_CALL SfxLibraryContainer::addModifyListener( const Reference< XModifyListener >& _rxListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maModifiable.addModifyListener( _rxListener ); } void SAL_CALL SfxLibraryContainer::removeModifyListener( const Reference< XModifyListener >& _rxListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maModifiable.removeModifyListener( _rxListener ); } // Methods XPersistentLibraryContainer -Any SAL_CALL SfxLibraryContainer::getRootLocation() throw (RuntimeException) +Any SAL_CALL SfxLibraryContainer::getRootLocation() throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return makeAny( getRootStorage() ); } -OUString SAL_CALL SfxLibraryContainer::getContainerLocationName() throw (RuntimeException) +OUString SAL_CALL SfxLibraryContainer::getContainerLocationName() throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maLibrariesDir; } void SAL_CALL SfxLibraryContainer::storeLibraries( ) - throw (WrappedTargetException, RuntimeException) + throw (WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); try @@ -2144,14 +2144,14 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto // Methods XElementAccess Type SAL_CALL SfxLibraryContainer::getElementType() - throw(RuntimeException) + throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maNameContainer.getElementType(); } sal_Bool SfxLibraryContainer::hasElements() - throw(RuntimeException) + throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); sal_Bool bRet = maNameContainer.hasElements(); @@ -2160,7 +2160,7 @@ sal_Bool SfxLibraryContainer::hasElements() // Methods XNameAccess Any SfxLibraryContainer::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); Any aRetAny = maNameContainer.getByName( aName ) ; @@ -2168,14 +2168,14 @@ Any SfxLibraryContainer::getByName( const OUString& aName ) } Sequence< OUString > SfxLibraryContainer::getElementNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maNameContainer.getElementNames(); } sal_Bool SfxLibraryContainer::hasByName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maNameContainer.hasByName( aName ) ; @@ -2183,7 +2183,7 @@ sal_Bool SfxLibraryContainer::hasByName( const OUString& aName ) // Methods XLibraryContainer Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const OUString& Name ) - throw(IllegalArgumentException, ElementExistException, RuntimeException) + throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pNewLib = implCreateLibrary( Name ); @@ -2202,7 +2202,7 @@ 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) + throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); // TODO: Check other reasons to force ReadOnly status @@ -2250,7 +2250,7 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink } void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); // Get and hold library before removing @@ -2321,7 +2321,7 @@ void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name ) } sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name ) - throw(NoSuchElementException, RuntimeException) + throw(NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2331,7 +2331,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name ) void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); Any aLibAny = maNameContainer.getByName( Name ) ; @@ -2470,7 +2470,7 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) // Methods XLibraryContainer2 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2479,7 +2479,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name ) } OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2493,7 +2493,7 @@ OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name ) } sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2502,7 +2502,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name ) } void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2526,7 +2526,7 @@ void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal } void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OUString& NewName ) - throw (NoSuchElementException, ElementExistException, RuntimeException) + throw (NoSuchElementException, ElementExistException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if( maNameContainer.hasByName( NewName ) ) @@ -2658,7 +2658,7 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU // Methods XInitialization void SAL_CALL SfxLibraryContainer::initialize( const Sequence< Any >& _rArguments ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); sal_Int32 nArgCount = _rArguments.getLength(); @@ -2739,28 +2739,28 @@ void SAL_CALL SfxLibraryContainer::disposing() // Methods XLibraryContainerPassword sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordProtected( const OUString& ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return sal_False; } sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordVerified( const OUString& ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + 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) + 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) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); throw IllegalArgumentException(); @@ -2768,7 +2768,7 @@ void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&, const // Methods XContainer void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maNameContainer.setEventSource( static_cast< XInterface* >( (OWeakObject*)this ) ); @@ -2776,7 +2776,7 @@ void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XConta } void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maNameContainer.removeContainerListener( xListener ); @@ -2785,7 +2785,7 @@ 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) + throw ( uno::Exception, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2860,7 +2860,7 @@ OUString SfxLibraryContainer::expand_url( const OUString& url ) //XLibraryContainer3 OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString& Name ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2875,12 +2875,12 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString // XVBACompatibility -sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() throw (RuntimeException) +sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() throw (RuntimeException, std::exception) { return mbVBACompat; } -void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompatmodeon ) throw (RuntimeException, std::exception) { /* The member variable mbVBACompat must be set first, the following call to getBasicManager() may call getVBACompatibilityMode() which returns @@ -2917,7 +2917,7 @@ void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( ::sal_Bool _vbacompa } } -void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname ) throw (RuntimeException, std::exception) { msProjectName = _projectname; BasicManager* pBasMgr = getBasicManager(); @@ -2931,23 +2931,23 @@ void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname } } -sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts() throw (RuntimeException) +sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts() throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return mnRunningVBAScripts; } -void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception) { maVBAScriptListeners.addTypedListener( rxListener ); } -void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception) { maVBAScriptListeners.removeTypedListener( rxListener ); } -void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) throw (RuntimeException) +void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) throw (RuntimeException, std::exception) { // own lock for accessing the number of running scripts enterMethod(); @@ -2969,7 +2969,7 @@ void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifie // Methods XServiceInfo sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -3039,7 +3039,7 @@ void SfxLibrary::implSetModified( sal_Bool _bIsModified ) // Methods XInterface Any SAL_CALL SfxLibrary::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet; @@ -3060,13 +3060,13 @@ Any SAL_CALL SfxLibrary::queryInterface( const Type& rType ) // Methods XElementAccess Type SfxLibrary::getElementType() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return maNameContainer.getElementType(); } sal_Bool SfxLibrary::hasElements() - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Bool bRet = maNameContainer.hasElements(); return bRet; @@ -3074,7 +3074,7 @@ sal_Bool SfxLibrary::hasElements() // Methods XNameAccess Any SfxLibrary::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { impl_checkLoaded(); @@ -3083,13 +3083,13 @@ Any SfxLibrary::getByName( const OUString& aName ) } Sequence< OUString > SfxLibrary::getElementNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return maNameContainer.getElementNames(); } sal_Bool SfxLibrary::hasByName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Bool bRet = maNameContainer.hasByName( aName ); return bRet; @@ -3124,7 +3124,7 @@ void SfxLibrary::impl_checkLoaded() // Methods XNameReplace void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { impl_checkReadOnly(); impl_checkLoaded(); @@ -3140,7 +3140,7 @@ 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) + throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { impl_checkReadOnly(); impl_checkLoaded(); @@ -3183,7 +3183,7 @@ void SfxLibrary::impl_removeWithoutChecks( const OUString& _rElementName ) } void SfxLibrary::removeByName( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException) + throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { impl_checkReadOnly(); impl_checkLoaded(); @@ -3192,7 +3192,7 @@ void SfxLibrary::removeByName( const OUString& Name ) // XTypeProvider Sequence< Type > SfxLibrary::getTypes() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { static OTypeCollection * s_pTypes_NameContainer = 0; { @@ -3215,7 +3215,7 @@ Sequence< Type > SfxLibrary::getTypes() Sequence< sal_Int8 > SfxLibrary::getImplementationId() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { static OImplementationId * s_pId_NameContainer = 0; { @@ -3234,28 +3234,28 @@ Sequence< sal_Int8 > SfxLibrary::getImplementationId() // Methods XContainer void SAL_CALL SfxLibrary::addContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { maNameContainer.setEventSource( static_cast< XInterface* >( (OWeakObject*)this ) ); maNameContainer.addContainerListener( xListener ); } void SAL_CALL SfxLibrary::removeContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { maNameContainer.removeContainerListener( xListener ); } // Methods XChangesNotifier void SAL_CALL SfxLibrary::addChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { maNameContainer.setEventSource( static_cast< XInterface* >( (OWeakObject*)this ) ); maNameContainer.addChangesListener( xListener ); } void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { maNameContainer.removeChangesListener( xListener ); } diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 57b07e5e4d8a..6c39c0ce6768 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -381,7 +381,7 @@ void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const OUString& a // Methods XLibraryContainerPassword sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const OUString& Name ) - throw (NoSuchElementException, RuntimeException) + throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -390,7 +390,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const O } sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OUString& Name ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -404,7 +404,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword ( const OUString& Name, const OUString& Password ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -447,7 +447,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& Name, const OUString& OldPassword, const OUString& NewPassword ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -1181,7 +1181,7 @@ void SfxScriptLibraryContainer::onNewRootStorage() } sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString& Library ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { BasicManager* pBasicMgr = getBasicManager(); OSL_ENSURE( pBasicMgr, "we need a basicmanager, really we do" ); @@ -1201,13 +1201,13 @@ void createRegistryInfo_SfxScriptLibraryContainer() } OUString SAL_CALL SfxScriptLibraryContainer::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getImplementationName_static(); } Sequence< OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -1307,7 +1307,7 @@ 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) + throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { if ( !hasModuleInfo( ModuleName ) ) { @@ -1317,7 +1317,7 @@ script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& Mod } sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Bool bRes = sal_False; ModuleInfoMap::iterator it = mModuleInfos.find( ModuleName ); @@ -1330,7 +1330,7 @@ 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) + throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { if ( hasModuleInfo( ModuleName ) ) { @@ -1340,7 +1340,7 @@ void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, co } void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException) + 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 435df5395ae0..ac13fa29fec1 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -870,7 +870,7 @@ Bridge::~Bridge() { } css::uno::Reference< css::uno::XInterface > Bridge::getInstance( - OUString const & sInstanceName) throw (css::uno::RuntimeException) + OUString const & sInstanceName) throw (css::uno::RuntimeException, std::exception) { if (sInstanceName.isEmpty()) { throw css::uno::RuntimeException( @@ -909,18 +909,18 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance( css::uno::UNO_REF_NO_ACQUIRE); } -OUString Bridge::getName() throw (css::uno::RuntimeException) { +OUString Bridge::getName() throw (css::uno::RuntimeException, std::exception) { return name_; } -OUString Bridge::getDescription() throw (css::uno::RuntimeException) { +OUString Bridge::getDescription() throw (css::uno::RuntimeException, std::exception) { OUStringBuffer b(name_); b.append(':'); b.append(connection_->getDescription()); return b.makeStringAndClear(); } -void Bridge::dispose() throw (css::uno::RuntimeException) { +void Bridge::dispose() throw (css::uno::RuntimeException, std::exception) { // 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 @@ -935,7 +935,7 @@ void Bridge::dispose() throw (css::uno::RuntimeException) { void Bridge::addEventListener( css::uno::Reference< css::lang::XEventListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(xListener.is()); { @@ -952,7 +952,7 @@ void Bridge::addEventListener( void Bridge::removeEventListener( css::uno::Reference< css::lang::XEventListener > const & aListener) - throw (css::uno::RuntimeException) + 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 b5a4f9d8f705..07c0f927bade 100644 --- a/binaryurp/source/bridge.hxx +++ b/binaryurp/source/bridge.hxx @@ -175,26 +175,26 @@ private: virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getInstance(OUString const & sInstanceName) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getName() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getDescription() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL dispose() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > const & xListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > const & aListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // Only called from reader_ thread: void sendCommitChangeRequest(); diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index 06adb3a7fde5..4e832a7b2ef8 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -87,19 +87,19 @@ BridgeFactory::BridgeFactory( BridgeFactory::~BridgeFactory() {} OUString BridgeFactory::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return static_getImplementationName(); } sal_Bool BridgeFactory::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< OUString > BridgeFactory::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return static_getSupportedServiceNames(); } @@ -139,7 +139,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge( } css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge( - OUString const & sName) throw (css::uno::RuntimeException) + OUString const & sName) throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(*this); BridgeMap::iterator i(named_.find(sName)); @@ -148,7 +148,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge( } css::uno::Sequence< css::uno::Reference< css::bridge::XBridge > > -BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException) { +BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(*this); if (unnamed_.size() > SAL_MAX_INT32) { throw css::uno::RuntimeException( diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx index 79150bcffed1..075975c53a0d 100644 --- a/binaryurp/source/bridgefactory.hxx +++ b/binaryurp/source/bridgefactory.hxx @@ -84,13 +84,13 @@ private: virtual ~BridgeFactory(); virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > SAL_CALL createBridge( @@ -108,12 +108,12 @@ private: virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > SAL_CALL getBridge( OUString const & sName) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); 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); + SAL_CALL getExistingBridges() throw (com::sun::star::uno::RuntimeException, std::exception); typedef std::list< diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 06dfa36757b4..1acc283b5aca 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) + OUString SAL_CALL Canvas::getServiceName( ) throw (uno::RuntimeException, std::exception) { return OUString( CANVAS_SERVICE_NAME ); } diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index d3d64b668350..0aa07f383618 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 (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // 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 380499f2944d..32c91672cd7c 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -138,7 +138,7 @@ namespace cairocanvas return maCanvasHelper.repaint( pSurface, viewState, renderState ); } - uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException) + uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException, std::exception) { uno::Any aRV( sal_Int32(0) ); // 0 ... get BitmapEx @@ -260,17 +260,17 @@ namespace cairocanvas return aRV; } - OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException) + OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException, std::exception) { return OUString( "CairoCanvas.CanvasBitmap" ); } - sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) + sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.CanvasBitmap"; diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index e26aa61070f5..fa33e20cc801 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -88,9 +88,9 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // SurfaceProvider virtual SurfaceSharedPtr getSurface(); @@ -114,8 +114,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 ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFastPropertyValue(sal_Int32, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException) {} + virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFastPropertyValue(sal_Int32, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException, std::exception) {} private: SurfaceProviderRef mpSurfaceProvider; diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index b772406137b9..743d31610266 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -139,17 +139,17 @@ namespace cairocanvas return mpSpriteCanvas->getOutputDevice(); } - OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( "CairoCanvas.CanvasCustomSprite" ); } - sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.CanvasCustomSprite"; diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index f9123d9c114d..65e0040a0870 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.hxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx @@ -112,9 +112,9 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // 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 96370023af3b..b452343aeae7 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -94,7 +94,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) + uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -108,14 +108,14 @@ namespace cairocanvas mpRefDevice ); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -123,7 +123,7 @@ namespace cairocanvas return rendering::FontMetrics(); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -131,7 +131,7 @@ namespace cairocanvas return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -139,17 +139,17 @@ namespace cairocanvas return uno::Sequence< beans::PropertyValue >(); } - OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( "CairoCanvas::CanvasFont" ); } - sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.CanvasFont"; diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx index 8d31a7d9bbbe..842273f05ca9 100644 --- a/canvas/source/cairo/cairo_canvasfont.hxx +++ b/canvas/source/cairo/cairo_canvasfont.hxx @@ -64,16 +64,16 @@ namespace cairocanvas virtual void SAL_CALL disposing(); // XCanvasFont - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > SAL_CALL createTextLayout( const ::com::sun::star::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::FontRequest SAL_CALL getFontRequest( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > SAL_CALL createTextLayout( const ::com::sun::star::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::FontRequest SAL_CALL getFontRequest( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); ::Font getVCLFont() const; diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 8121a0d0267c..3fdca678b00e 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1629,25 +1629,25 @@ namespace cairocanvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException) + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) { 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) + uno::RuntimeException, std::exception) { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -1655,7 +1655,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) + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -1676,7 +1676,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -1697,7 +1697,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -1714,7 +1714,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -1731,7 +1731,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -1748,7 +1748,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -1767,21 +1767,21 @@ namespace cairocanvas } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) { 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) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if( dynamic_cast(targetColorSpace.get()) ) { @@ -1813,7 +1813,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) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if( dynamic_cast(targetColorSpace.get()) ) { @@ -1830,7 +1830,7 @@ namespace cairocanvas } } virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -1856,7 +1856,7 @@ namespace cairocanvas } virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -1882,7 +1882,7 @@ namespace cairocanvas return aRes; } virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -1905,7 +1905,7 @@ namespace cairocanvas } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -1924,7 +1924,7 @@ namespace cairocanvas } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -1943,7 +1943,7 @@ namespace cairocanvas return aRes; } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -1986,25 +1986,25 @@ namespace cairocanvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException) + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) { 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) + uno::RuntimeException, std::exception) { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -2012,7 +2012,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) + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -2046,15 +2046,15 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return impl_convertToARGB( deviceColor ); } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return impl_convertToARGB( deviceColor ); } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -2088,31 +2088,31 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return impl_convertFromARGB( rgbColor ); } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return impl_convertFromARGB( rgbColor ); } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) { 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) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if( dynamic_cast(targetColorSpace.get()) ) { @@ -2144,7 +2144,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) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if( dynamic_cast(targetColorSpace.get()) ) { @@ -2161,7 +2161,7 @@ namespace cairocanvas } } virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -2180,12 +2180,12 @@ namespace cairocanvas } virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return impl_convertIntegerToARGB( deviceColor ); } virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return impl_convertIntegerToARGB( deviceColor ); } @@ -2212,7 +2212,7 @@ namespace cairocanvas } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -2231,12 +2231,12 @@ namespace cairocanvas } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return impl_convertIntegerFromARGB( rgbColor ); } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return impl_convertIntegerFromARGB( rgbColor ); } diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index 6ec9ecdc917b..09cf42736f34 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -121,7 +121,7 @@ namespace cairocanvas SpriteCanvasBaseT::disposeThis(); } - ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException) + ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) { return updateScreen( bUpdateAll ); } @@ -131,7 +131,7 @@ namespace cairocanvas return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -144,7 +144,7 @@ namespace cairocanvas mbSurfaceDirty); } - OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException) + OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException, std::exception) { return OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 5ff69cd8c710..6869881e7a42 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -123,14 +123,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 (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL switchBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); // XSpriteCanvas (partial) - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // SurfaceProvider virtual SurfaceSharedPtr getSurface(); diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 40da537bcc62..48b0d522b0ef 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -130,7 +130,7 @@ namespace cairocanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -138,7 +138,7 @@ namespace cairocanvas 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( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -146,7 +146,7 @@ namespace cairocanvas return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -154,14 +154,14 @@ namespace cairocanvas return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException, std::exception) { ::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 ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -174,7 +174,7 @@ namespace cairocanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -211,7 +211,7 @@ namespace cairocanvas } } - double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -220,7 +220,7 @@ namespace cairocanvas } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, - double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +228,7 @@ namespace cairocanvas 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*/ ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -237,7 +237,7 @@ namespace cairocanvas } rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -247,7 +247,7 @@ namespace cairocanvas sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, sal_Int32 /*nCaretAdvancement*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -256,7 +256,7 @@ namespace cairocanvas } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -265,7 +265,7 @@ namespace cairocanvas } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -273,7 +273,7 @@ namespace cairocanvas return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException) + double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -281,21 +281,21 @@ namespace cairocanvas return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException, std::exception) { ::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( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mpFont.getRef(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException) + rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -636,17 +636,17 @@ namespace cairocanvas OffsetTransformer( aMatrix ) ); } - OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( "CairoCanvas::TextLayout" ); } - sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.TextLayout"; diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index df2a722186ec..45d835d17523 100644 --- a/canvas/source/cairo/cairo_textlayout.hxx +++ b/canvas/source/cairo/cairo_textlayout.hxx @@ -58,28 +58,28 @@ namespace cairocanvas virtual void SAL_CALL disposing(); // XTextLayout - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL applyLogicalAdvancements( const ::com::sun::star::uno::Sequence< double >& aAdvancements ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL justify( double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL combinedJustify( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::TextHit SAL_CALL getTextHit( const ::com::sun::star::geometry::RealPoint2D& aHitPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getBaselineOffset( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL applyLogicalAdvancements( const ::com::sun::star::uno::Sequence< double >& aAdvancements ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL justify( double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL combinedJustify( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::TextHit SAL_CALL getTextHit( const ::com::sun::star::geometry::RealPoint2D& aHitPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getBaselineOffset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); bool draw( SurfaceSharedPtr& pSurface, OutputDevice& rOutDev, diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 9dc19fe8a140..7b80ee596a26 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -98,31 +98,31 @@ public: CanvasFactory( Reference const & xContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Sequence SAL_CALL getSupportedServiceNames() - throw (RuntimeException); + throw (RuntimeException, std::exception); // XMultiComponentFactory virtual Sequence SAL_CALL getAvailableServiceNames() - throw (RuntimeException); + throw (RuntimeException, std::exception); virtual Reference SAL_CALL createInstanceWithContext( OUString const & name, - Reference const & xContext ) throw (Exception); + Reference const & xContext ) throw (Exception, std::exception); virtual Reference SAL_CALL createInstanceWithArgumentsAndContext( OUString const & name, Sequence const & args, - Reference const & xContext ) throw (Exception); + Reference const & xContext ) throw (Exception, std::exception); // XMultiServiceFactory virtual Reference SAL_CALL createInstance( OUString const & name ) - throw (Exception); + throw (Exception, std::exception); virtual Reference SAL_CALL createInstanceWithArguments( OUString const & name, Sequence const & args ) - throw (Exception); + throw (Exception, std::exception); }; CanvasFactory::CanvasFactory( Reference const & xContext ) : @@ -226,26 +226,26 @@ Reference create( Reference const & xContext ) } // XServiceInfo -OUString CanvasFactory::getImplementationName() throw (RuntimeException) +OUString CanvasFactory::getImplementationName() throw (RuntimeException, std::exception) { return getImplName(); } sal_Bool CanvasFactory::supportsService( OUString const & serviceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } Sequence CanvasFactory::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getSuppServices(); } // XMultiComponentFactory Sequence CanvasFactory::getAvailableServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Sequence aServiceNames(m_aAvailableImplementations.size()); std::transform(m_aAvailableImplementations.begin(), @@ -257,7 +257,7 @@ Sequence CanvasFactory::getAvailableServiceNames() Reference CanvasFactory::createInstanceWithContext( OUString const & name, Reference const & xContext ) - throw (Exception) + throw (Exception, std::exception) { return createInstanceWithArgumentsAndContext( name, Sequence(), xContext ); @@ -468,7 +468,7 @@ Reference CanvasFactory::lookupAndUse( Reference CanvasFactory::createInstanceWithArgumentsAndContext( OUString const & preferredOne, Sequence const & args, - Reference const & xContext ) throw (Exception) + Reference const & xContext ) throw (Exception, std::exception) { Reference xCanvas( lookupAndUse( preferredOne, args, xContext ) ); @@ -482,7 +482,7 @@ Reference CanvasFactory::createInstanceWithArgumentsAndContext( // XMultiServiceFactory Reference CanvasFactory::createInstance( OUString const & name ) - throw (Exception) + throw (Exception, std::exception) { return createInstanceWithArgumentsAndContext( name, Sequence(), m_xContext ); @@ -490,7 +490,7 @@ Reference CanvasFactory::createInstance( OUString const & name ) Reference CanvasFactory::createInstanceWithArguments( - OUString const & name, Sequence const & args ) throw (Exception) + OUString const & name, Sequence const & args ) throw (Exception, std::exception) { return createInstanceWithArgumentsAndContext( name, args, m_xContext ); diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index 7c0867176438..2943f8a38bc3 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -64,7 +64,7 @@ namespace oglcanvas } void SAL_CALL CanvasCustomSprite::setAlpha( double alpha ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { canvas::tools::verifyRange( alpha, 0.0, 1.0 ); @@ -75,7 +75,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) + uno::RuntimeException, std::exception) { canvas::tools::verifyArgs(aNewPos, viewState, renderState, BOOST_CURRENT_FUNCTION, @@ -93,38 +93,38 @@ namespace oglcanvas } void SAL_CALL CanvasCustomSprite::transform( const geometry::AffineMatrix2D& aTransformation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); maTransformation = aTransformation; } - void SAL_CALL CanvasCustomSprite::clip( const uno::Reference< rendering::XPolyPolygon2D >& xClip ) throw (uno::RuntimeException) + void SAL_CALL CanvasCustomSprite::clip( const uno::Reference< rendering::XPolyPolygon2D >& xClip ) throw (uno::RuntimeException, std::exception) { mxClip = xClip; } - void SAL_CALL CanvasCustomSprite::setPriority( double nPriority ) throw (uno::RuntimeException) + void SAL_CALL CanvasCustomSprite::setPriority( double nPriority ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); mfPriority = nPriority; } - void SAL_CALL CanvasCustomSprite::show() throw (uno::RuntimeException) + void SAL_CALL CanvasCustomSprite::show() throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if( mpSpriteCanvas.is() ) mpSpriteCanvas->show(this); } - void SAL_CALL CanvasCustomSprite::hide() throw (uno::RuntimeException) + void SAL_CALL CanvasCustomSprite::hide() throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if( mpSpriteCanvas.is() ) mpSpriteCanvas->hide(this); } - uno::Reference< rendering::XCanvas > SAL_CALL CanvasCustomSprite::getContentCanvas() throw (uno::RuntimeException) + uno::Reference< rendering::XCanvas > SAL_CALL CanvasCustomSprite::getContentCanvas() throw (uno::RuntimeException, std::exception) { return this; } diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx index 5e52609cb82b..8d9721e5efe1 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.hxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx @@ -63,16 +63,16 @@ namespace oglcanvas virtual void disposeThis(); // XSprite - virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clip( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& aClip ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPriority( double nPriority ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL show() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL hide() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setAlpha( double alpha ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL move( const ::com::sun::star::geometry::RealPoint2D& aNewPos, const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL transform( const ::com::sun::star::geometry::AffineMatrix2D& aTransformation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clip( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >& aClip ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPriority( double nPriority ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL show() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL hide() throw (::com::sun::star::uno::RuntimeException, std::exception); // XCustomSprite - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL getContentCanvas() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > SAL_CALL getContentCanvas() throw (::com::sun::star::uno::RuntimeException, std::exception); double getPriority() const { return mfPriority; } diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx index d465919ab2b3..8e487ecaa3ee 100644 --- a/canvas/source/opengl/ogl_canvasfont.cxx +++ b/canvas/source/opengl/ogl_canvasfont.cxx @@ -34,14 +34,14 @@ namespace oglcanvas uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, - sal_Int64 nRandomSeed ) throw (uno::RuntimeException) + sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception) { ::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( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -49,7 +49,7 @@ namespace oglcanvas return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -57,14 +57,14 @@ namespace oglcanvas return uno::Sequence< beans::PropertyValue >(); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx index 88cdf1691de0..df8b46ddf0d1 100644 --- a/canvas/source/opengl/ogl_canvasfont.hxx +++ b/canvas/source/opengl/ogl_canvasfont.hxx @@ -49,11 +49,11 @@ namespace oglcanvas virtual void SAL_CALL disposing(); // XCanvasFont - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > SAL_CALL createTextLayout( const ::com::sun::star::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::FontRequest SAL_CALL getFontRequest( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > SAL_CALL createTextLayout( const ::com::sun::star::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::FontRequest SAL_CALL getFontRequest( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception); const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const; diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 93371a2df0d5..b804e4b07a16 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -93,7 +93,7 @@ namespace oglcanvas SpriteCanvasBaseT::disposeThis(); } - ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException) + ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -115,7 +115,7 @@ namespace oglcanvas uno::Reference< rendering::XAnimatedSprite > SAL_CALL SpriteCanvas::createSpriteFromAnimation( const uno::Reference< rendering::XAnimation >& /*animation*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return uno::Reference< rendering::XAnimatedSprite >(); } @@ -124,14 +124,14 @@ namespace oglcanvas const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, ::sal_Int8 /*interpolationMode*/ ) throw (lang::IllegalArgumentException, rendering::VolatileContentDestroyedException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return uno::Reference< rendering::XAnimatedSprite >(); } uno::Reference< rendering::XCustomSprite > SAL_CALL SpriteCanvas::createCustomSprite( const geometry::RealSize2D& spriteSize ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return uno::Reference< rendering::XCustomSprite >( new CanvasCustomSprite(spriteSize, this, maDeviceHelper) ); @@ -139,7 +139,7 @@ namespace oglcanvas uno::Reference< rendering::XSprite > SAL_CALL SpriteCanvas::createClonedSprite( const uno::Reference< rendering::XSprite >& /*original*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return uno::Reference< rendering::XSprite >(); } @@ -151,7 +151,7 @@ namespace oglcanvas return maDeviceHelper.showBuffer(mbIsVisible, bUpdateAll); } - ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException) + ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException, std::exception) { return ::rtl::OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index 32260b4f61c8..f59bc8bb9c2c 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -85,20 +85,20 @@ namespace oglcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); // XBufferController (partial) - virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL switchBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); // XSpriteCanvas - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimation >& animation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCustomSprite > SAL_CALL createCustomSprite( const ::com::sun::star::geometry::RealSize2D& spriteSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite > SAL_CALL createClonedSprite( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSprite >& original ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL updateScreen( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); 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 42f8d97221ea..a155c2c775f7 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -39,7 +39,7 @@ namespace oglcanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -47,7 +47,7 @@ namespace oglcanvas 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( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -55,7 +55,7 @@ namespace oglcanvas return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -63,14 +63,14 @@ namespace oglcanvas return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException, std::exception) { ::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 ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -83,7 +83,7 @@ namespace oglcanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -109,7 +109,7 @@ namespace oglcanvas } } - double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -118,7 +118,7 @@ namespace oglcanvas } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, - double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -126,7 +126,7 @@ namespace oglcanvas 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*/ ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -135,7 +135,7 @@ namespace oglcanvas } rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -145,7 +145,7 @@ namespace oglcanvas sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, sal_Int32 /*nCaretAdvancement*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -154,7 +154,7 @@ namespace oglcanvas } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -163,7 +163,7 @@ namespace oglcanvas } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -171,7 +171,7 @@ namespace oglcanvas return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException) + double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -179,21 +179,21 @@ namespace oglcanvas return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException, std::exception) { ::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( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mpFont.getRef(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException) + rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx index 5938ef0e4c25..e7cfc54263b8 100644 --- a/canvas/source/opengl/ogl_textlayout.hxx +++ b/canvas/source/opengl/ogl_textlayout.hxx @@ -42,23 +42,23 @@ namespace oglcanvas virtual void SAL_CALL disposing(); // XTextLayout - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL applyLogicalAdvancements( const ::com::sun::star::uno::Sequence< double >& aAdvancements ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL justify( double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL combinedJustify( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::TextHit SAL_CALL getTextHit( const ::com::sun::star::geometry::RealPoint2D& aHitPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getBaselineOffset( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL applyLogicalAdvancements( const ::com::sun::star::uno::Sequence< double >& aAdvancements ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL justify( double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL combinedJustify( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::TextHit SAL_CALL getTextHit( const ::com::sun::star::geometry::RealPoint2D& aHitPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getBaselineOffset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); bool draw( const ::com::sun::star::rendering::ViewState& rViewState, const ::com::sun::star::rendering::RenderState& rRenderState, diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 5cf289a172ca..472338b817f9 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -176,7 +176,7 @@ namespace private: // Ifc XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException) + virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException, std::exception) { return OUString( SERVICE_NAME ); } @@ -185,7 +185,7 @@ namespace virtual void SAL_CALL selectFont( const OUString& sFontName, double size, ::sal_Bool bold, - ::sal_Bool italic ) throw (uno::RuntimeException) + ::sal_Bool italic ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -197,31 +197,31 @@ namespace italic ? rendering::PanoseLetterForm::OBLIQUE_CONTACT : rendering::PanoseLetterForm::ANYTHING; } - virtual void SAL_CALL setPenColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException) + virtual void SAL_CALL setPenColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); *(maRenderState.m_aPenColor) = nsRgbaColor; } - virtual void SAL_CALL setFillColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException) + virtual void SAL_CALL setFillColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); *(maRenderState.m_aFillColor) = nsRgbaColor; } - virtual void SAL_CALL setRectClip( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException) + virtual void SAL_CALL setRectClip( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); *(maRenderState.m_aRectClip) = aRect; } - virtual void SAL_CALL setTransformation( const geometry::AffineMatrix2D& aTransform ) throw (uno::RuntimeException) + virtual void SAL_CALL setTransformation( const geometry::AffineMatrix2D& aTransform ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); maRenderState.m_aTransformation = aTransform; } - virtual void SAL_CALL drawPixel( const geometry::RealPoint2D& aPoint ) throw (uno::RuntimeException) + virtual void SAL_CALL drawPixel( const geometry::RealPoint2D& aPoint ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); mxCanvas->drawPoint(aPoint, @@ -230,7 +230,7 @@ namespace } virtual void SAL_CALL drawLine( const geometry::RealPoint2D& aStartPoint, - const geometry::RealPoint2D& aEndPoint ) throw (uno::RuntimeException) + const geometry::RealPoint2D& aEndPoint ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); mxCanvas->drawLine(aStartPoint, @@ -239,7 +239,7 @@ namespace createStrokingRenderState()); } - virtual void SAL_CALL drawRect( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException) + virtual void SAL_CALL drawRect( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); uno::Reference< rendering::XPolyPolygon2D > xPoly( @@ -273,7 +273,7 @@ namespace virtual void SAL_CALL drawText( const rendering::StringContext& aText, const geometry::RealPoint2D& aOutPos, - ::sal_Int8 nTextDirection ) throw (uno::RuntimeException) + ::sal_Int8 nTextDirection ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); const basegfx::B2DHomMatrix offsetTransform(basegfx::tools::createTranslateB2DHomMatrix(aOutPos.X,aOutPos.Y)); @@ -299,61 +299,61 @@ namespace mxCanvas->drawBitmap(xBitmap,maViewState,aRenderState); } - virtual uno::Reference< rendering::XGraphicDevice > SAL_CALL getDevice( ) throw (uno::RuntimeException) + virtual uno::Reference< rendering::XGraphicDevice > SAL_CALL getDevice( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mxCanvas->getDevice(); } - virtual uno::Reference< rendering::XCanvas > SAL_CALL getCanvas( ) throw (uno::RuntimeException) + virtual uno::Reference< rendering::XCanvas > SAL_CALL getCanvas( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mxCanvas; } - virtual rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (uno::RuntimeException) + virtual rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maFont.getOutValue()->getFontMetrics(); } - virtual uno::Reference< rendering::XCanvasFont > SAL_CALL getCurrentFont( ) throw (uno::RuntimeException) + virtual uno::Reference< rendering::XCanvasFont > SAL_CALL getCurrentFont( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maFont.getOutValue(); } - virtual ::sal_Int32 SAL_CALL getCurrentPenColor( ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getCurrentPenColor( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aPenColor.getInValue(); } - virtual ::sal_Int32 SAL_CALL getCurrentFillColor( ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getCurrentFillColor( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aFillColor.getInValue(); } - virtual geometry::RealRectangle2D SAL_CALL getCurrentClipRect( ) throw (uno::RuntimeException) + virtual geometry::RealRectangle2D SAL_CALL getCurrentClipRect( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aRectClip.getInValue(); } - virtual geometry::AffineMatrix2D SAL_CALL getCurrentTransformation( ) throw (uno::RuntimeException) + virtual geometry::AffineMatrix2D SAL_CALL getCurrentTransformation( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aTransformation; } - virtual rendering::ViewState SAL_CALL getCurrentViewState( ) throw (uno::RuntimeException) + virtual rendering::ViewState SAL_CALL getCurrentViewState( ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maViewState; } - virtual rendering::RenderState SAL_CALL getCurrentRenderState( sal_Bool bUseFillColor ) throw (uno::RuntimeException) + virtual rendering::RenderState SAL_CALL getCurrentRenderState( sal_Bool bUseFillColor ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if( bUseFillColor ) diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index 89067e12db02..29f204121ac0 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -53,7 +53,7 @@ namespace canvas mxTarget.clear(); } - sal_Int8 SAL_CALL CachedPrimitiveBase::redraw( const rendering::ViewState& aState ) throw (lang::IllegalArgumentException, uno::RuntimeException) + sal_Int8 SAL_CALL CachedPrimitiveBase::redraw( const rendering::ViewState& aState ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::basegfx::B2DHomMatrix aUsedTransformation; ::basegfx::B2DHomMatrix aNewTransformation; @@ -79,17 +79,17 @@ namespace canvas bSameViewTransforms ); } - OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) throw (uno::RuntimeException) + OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) throw (uno::RuntimeException, std::exception) { return OUString("canvas::CachedPrimitiveBase"); } - sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) + sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) throw (uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.CachedBitmap"; diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index d6b949b511c5..d3fff250cdcf 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -226,25 +226,25 @@ namespace canvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException) + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) { 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) + uno::RuntimeException, std::exception) { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -252,7 +252,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) + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -269,7 +269,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -286,7 +286,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -303,7 +303,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -320,7 +320,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -337,7 +337,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -356,21 +356,21 @@ namespace canvas } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) { 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) + uno::RuntimeException, std::exception) { if( dynamic_cast(targetColorSpace.get()) ) { @@ -402,7 +402,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) + uno::RuntimeException, std::exception) { if( dynamic_cast(targetColorSpace.get()) ) { @@ -418,7 +418,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) + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -439,7 +439,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -461,7 +461,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -484,7 +484,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -502,7 +502,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -520,7 +520,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -563,25 +563,25 @@ namespace canvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException) + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) { 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) + uno::RuntimeException, std::exception) { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -589,7 +589,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) + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -606,7 +606,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -623,7 +623,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const double* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -640,7 +640,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -657,7 +657,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -674,7 +674,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -693,21 +693,21 @@ namespace canvas } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException) + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException) + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException) + virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) { 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) + uno::RuntimeException, std::exception) { if( dynamic_cast(targetColorSpace.get()) ) { @@ -739,7 +739,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) + uno::RuntimeException, std::exception) { if( dynamic_cast(targetColorSpace.get()) ) { @@ -755,7 +755,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) + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -776,7 +776,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -798,7 +798,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const sal_Int8* pIn( deviceColor.getConstArray() ); const sal_Size nLen( deviceColor.getLength() ); @@ -820,7 +820,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -838,7 +838,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); @@ -856,7 +856,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException) + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const sal_Size nLen( rgbColor.getLength() ); diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index 67b15d6952bd..688f90d4b3d4 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -168,7 +168,7 @@ namespace canvas mxDevice.clear(); } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL ParametricPolyPolygon::getOutline( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL ParametricPolyPolygon::getOutline( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -176,7 +176,7 @@ namespace canvas return uno::Reference< rendering::XPolyPolygon2D >(); } - uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getColor( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getColor( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -184,7 +184,7 @@ namespace canvas return uno::Sequence< double >(); } - uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getPointColor( const geometry::RealPoint2D& /*point*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getPointColor( const geometry::RealPoint2D& /*point*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -192,7 +192,7 @@ namespace canvas return uno::Sequence< double >(); } - uno::Reference< rendering::XColorSpace > SAL_CALL ParametricPolyPolygon::getColorSpace() throw (uno::RuntimeException) + uno::Reference< rendering::XColorSpace > SAL_CALL ParametricPolyPolygon::getColorSpace() throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -200,17 +200,17 @@ namespace canvas } - OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) throw (uno::RuntimeException) + OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) throw (uno::RuntimeException, std::exception) { return OUString( "Canvas::ParametricPolyPolygon" ); } - sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) + sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) throw (uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.ParametricPolyPolygon"; diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index 5a44e4016307..62ffda232657 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -130,7 +130,7 @@ namespace vclcanvas CanvasBaseT::disposeThis(); } - OUString SAL_CALL Canvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL Canvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString( CANVAS_SERVICE_NAME ); } diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index 71c010f80a63..0c9970631adc 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -98,7 +98,7 @@ namespace vclcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ); // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // RepaintTarget virtual bool repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index 0585fa7e1af7..c7468c817fc3 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -72,17 +72,17 @@ namespace vclcanvas } - OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException) + OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException, std::exception) { return OUString( "VCLCanvas.CanvasBitmap" ); } - sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) + sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.CanvasBitmap"; @@ -113,7 +113,7 @@ namespace vclcanvas return maCanvasHelper.repaint( rGrf, viewState, renderState, rPt, rSz, rAttr ); } - uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException) + uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException, std::exception) { if( nHandle == 0 ) { BitmapEx* pBitmapEx = new BitmapEx( getBitmap() ); diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 9d2764d1b145..865996c05ab0 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -79,9 +79,9 @@ namespace vclcanvas const OutDevProviderSharedPtr& rOutDevProvider ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // RepaintTarget interface virtual bool repaint( const GraphicObjectSharedPtr& rGrf, @@ -104,8 +104,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 ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFastPropertyValue(sal_Int32, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException) {} + virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFastPropertyValue(sal_Int32, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException, std::exception) {} 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 a70091b39d20..1b04c1dcbdf1 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -118,17 +118,17 @@ namespace vclcanvas maCanvasHelper.clear(); } - OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( "VCLCanvas.CanvasCustomSprite" ); } - sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.CanvasCustomSprite"; diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index 90c3dd74e36e..3b8dbd6de822 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( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); // Sprite virtual void redraw( OutputDevice& rOutDev, diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index 0393751c8093..ec4f670afbc0 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -94,7 +94,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) + uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -109,14 +109,14 @@ namespace vclcanvas mpOutDevProvider); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -135,7 +135,7 @@ namespace vclcanvas aMetric.GetAscent() / 2.0); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -143,7 +143,7 @@ namespace vclcanvas return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -151,17 +151,17 @@ namespace vclcanvas return uno::Sequence< beans::PropertyValue >(); } - OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( "VCLCanvas::CanvasFont" ); } - sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.CanvasFont"; diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx index c5bb892ac79b..823e236bb06c 100644 --- a/canvas/source/vcl/canvasfont.hxx +++ b/canvas/source/vcl/canvasfont.hxx @@ -67,16 +67,16 @@ namespace vclcanvas virtual void SAL_CALL disposing(); // XCanvasFont - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > SAL_CALL createTextLayout( const ::com::sun::star::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::FontRequest SAL_CALL getFontRequest( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > SAL_CALL createTextLayout( const ::com::sun::star::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::FontRequest SAL_CALL getFontRequest( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); ::Font getVCLFont() const; diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index c18a7f9e6a58..ca815d855b91 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -128,7 +128,7 @@ namespace vclcanvas SpriteCanvasBaseT::disposeThis(); } - ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException) + ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) { return updateScreen( bUpdateAll ); } @@ -138,7 +138,7 @@ namespace vclcanvas return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -149,7 +149,7 @@ namespace vclcanvas mbSurfaceDirty); } - OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index cb57d8f57503..92dc4daeb2cd 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 (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL showBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL switchBuffer( ::sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); // XSpriteCanvas (partial) - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // RepaintTarget virtual bool repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 36ba673db317..9b0f89853f23 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -101,7 +101,7 @@ namespace vclcanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -153,7 +153,7 @@ namespace vclcanvas return aOutlineSequence; } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -205,7 +205,7 @@ namespace vclcanvas return aBoundingBoxes; } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -213,14 +213,14 @@ namespace vclcanvas return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; 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 ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -230,7 +230,7 @@ namespace vclcanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -268,7 +268,7 @@ namespace vclcanvas } } - double SAL_CALL TextLayout::justify( double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double SAL_CALL TextLayout::justify( double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -279,7 +279,7 @@ namespace vclcanvas } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& aNextLayouts, - double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -290,7 +290,7 @@ namespace vclcanvas 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 ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -300,7 +300,7 @@ namespace vclcanvas return rendering::TextHit(); } - rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -311,7 +311,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) + sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -323,7 +323,7 @@ namespace vclcanvas return 0; } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -334,7 +334,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) + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -345,7 +345,7 @@ namespace vclcanvas return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException) + double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -353,21 +353,21 @@ namespace vclcanvas return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return mnTextDirection; } - uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException) + uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpFont.getRef(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException) + rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -462,17 +462,17 @@ namespace vclcanvas OffsetTransformer( aMatrix ) ); } - OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString( "VCLCanvas::TextLayout" ); } - sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.rendering.TextLayout"; diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx index 59608a7e296a..deb7f3f75774 100644 --- a/canvas/source/vcl/textlayout.hxx +++ b/canvas/source/vcl/textlayout.hxx @@ -59,28 +59,28 @@ namespace vclcanvas virtual void SAL_CALL disposing(); // XTextLayout - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL applyLogicalAdvancements( const ::com::sun::star::uno::Sequence< double >& aAdvancements ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL justify( double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL combinedJustify( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::TextHit SAL_CALL getTextHit( const ::com::sun::star::geometry::RealPoint2D& aHitPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getBaselineOffset( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL applyLogicalAdvancements( const ::com::sun::star::uno::Sequence< double >& aAdvancements ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL justify( double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL combinedJustify( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::TextHit SAL_CALL getTextHit( const ::com::sun::star::geometry::RealPoint2D& aHitPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getBaselineOffset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::rendering::StringContext SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); bool draw( OutputDevice& rOutDev, const Point& rOutpos, diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 8e965ba203af..35a43e3738db 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -234,7 +234,7 @@ public: // ::com::sun::star::lang::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XModel (required interface) @@ -242,242 +242,242 @@ public: attachResource( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL - getURL() throw (::com::sun::star::uno::RuntimeException); + getURL() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL - getArgs() throw (::com::sun::star::uno::RuntimeException); + getArgs() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - lockControllers() throw (::com::sun::star::uno::RuntimeException); + lockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - unlockControllers() throw (::com::sun::star::uno::RuntimeException); + unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasControllersLocked() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw (::com::sun::star::container::NoSuchElementException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XComponent (base of XModel) virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException); + dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XCloseable virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw(::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XCloseBroadcaster (base of XCloseable) virtual void SAL_CALL addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XStorable2 (extension of XStorable) virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XStorable (required interface) virtual sal_Bool SAL_CALL - hasLocation() throw (::com::sun::star::uno::RuntimeException); + hasLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL - getLocation() throw (::com::sun::star::uno::RuntimeException); + getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL - isReadonly() throw (::com::sun::star::uno::RuntimeException); + isReadonly() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL store() throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeAsURL( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeToURL( const OUString& rURL , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifiable (required interface) virtual sal_Bool SAL_CALL - isModified() throw (::com::sun::star::uno::RuntimeException); + isModified() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifyBroadcaster (base of XModifiable) virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ datatransferable::XTransferable ____ virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // lang::XTypeProvider (overloaded method of WeakImplHelper) virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL - getTypes() throw (::com::sun::star::uno::RuntimeException); + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ document::XDocumentPropertiesSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL - getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException); + getDocumentProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ document::XUndoManagerSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL - getUndoManager( ) throw (::com::sun::star::uno::RuntimeException); + getUndoManager( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::chart2::XChartDocument virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL - getFirstDiagram() throw (::com::sun::star::uno::RuntimeException); + getFirstDiagram() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setFirstDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL createInternalDataProvider( sal_Bool bCloneExistingData ) throw (::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL hasInternalDataProvider() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > SAL_CALL getDataProvider() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setChartTypeManager( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager >& xNewManager ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager > SAL_CALL getChartTypeManager() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getPageBackground() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataReceiver (public API) ____ virtual void SAL_CALL attachDataProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider >& xProvider ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL getUsedData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL attachNumberFormatsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XInterface (for old API wrapper) ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XLoadable ____ virtual void SAL_CALL initNew() throw (::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL load( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XVisualObject ____ virtual void SAL_CALL setVisualAreaSize( @@ -486,34 +486,34 @@ public: throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getMapUnit( ::sal_Int64 nAspect ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); + getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XStorageBasedDocument ____ virtual void SAL_CALL loadFromStorage( @@ -523,59 +523,59 @@ public: ::com::sun::star::frame::DoubleInitializationException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL switchToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentStorage() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addStorageChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStorageChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // for SvNumberFormatsSupplierObj // ____ XUnoTunnel ___ virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XNumberFormatsSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChild ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSource ____ allows access to the curently used data and data ranges virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XDumper virtual OUString SAL_CALL dump() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // normal methods ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 702bebf1699a..a12d9bbb8027 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -118,7 +118,7 @@ public: // ___lang::XInitialization___ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // ___ExplicitValueProvider___ virtual sal_Bool getExplicitValuesForAxis( @@ -138,56 +138,56 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException , ::com::sun::star::io::IOException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifyListener virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // ::com::sun::star::util::XModeChangeBroadcaster - virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XUpdatable virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XMultiServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); // for ExplicitValueProvider // ____ XUnoTunnel ___ virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XDumper virtual OUString SAL_CALL dump() diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index c73221285e95..a2b1a694fe75 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -506,14 +506,14 @@ void SAL_CALL AccessibleBase::disposing() // ________ XAccessible ________ Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return this; } // ________ AccessibleBase::XAccessibleContext ________ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( GetMutex() ); if( ! m_bMayHaveChildren || @@ -539,7 +539,7 @@ sal_Int32 AccessibleBase::ImplGetAccessibleChildCount() const } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, RuntimeException) + throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > xResult; @@ -583,7 +583,7 @@ Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > aResult; @@ -594,7 +594,7 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent() } sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -604,20 +604,20 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent() } sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return AccessibleRole::SHAPE; } Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet() - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference< XAccessibleRelationSet > aResult; return aResult; } Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet() - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( ! m_bStateSetInitialized ) { @@ -638,7 +638,7 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet( } lang::Locale SAL_CALL AccessibleBase::getLocale() - throw (IllegalAccessibleComponentStateException, RuntimeException) + throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { CheckDisposeState(); @@ -647,7 +647,7 @@ lang::Locale SAL_CALL AccessibleBase::getLocale() // ________ AccessibleBase::XAccessibleComponent ________ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { awt::Rectangle aRect( getBounds() ); @@ -662,7 +662,7 @@ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint ) } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > aResult; @@ -702,7 +702,7 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const aw } awt::Rectangle SAL_CALL AccessibleBase::getBounds() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ExplicitValueProvider *pExplicitValueProvider( ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView )); @@ -738,7 +738,7 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() } awt::Point SAL_CALL AccessibleBase::getLocation() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); awt::Rectangle aBBox( getBounds() ); @@ -746,7 +746,7 @@ awt::Point SAL_CALL AccessibleBase::getLocation() } awt::Point SAL_CALL AccessibleBase::getLocationOnScreen() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -767,7 +767,7 @@ awt::Point SAL_CALL AccessibleBase::getLocationOnScreen() } awt::Size SAL_CALL AccessibleBase::getSize() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); awt::Rectangle aBBox( getBounds() ); @@ -775,7 +775,7 @@ awt::Size SAL_CALL AccessibleBase::getSize() } void SAL_CALL AccessibleBase::grabFocus() - throw (RuntimeException) + throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -787,13 +787,13 @@ void SAL_CALL AccessibleBase::grabFocus() } sal_Int32 SAL_CALL AccessibleBase::getForeground() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getColor( ACC_BASE_FOREGROUND ); } sal_Int32 SAL_CALL AccessibleBase::getBackground() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getColor( ACC_BASE_BACKGROUND ); } @@ -892,19 +892,19 @@ sal_Int32 AccessibleBase::getColor( eColorType eColType ) // ________ AccessibleBase::XServiceInfo ________ OUString SAL_CALL AccessibleBase::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "AccessibleBase" ); } sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( 2 ); OUString* pStr = aSeq.getArray(); @@ -916,13 +916,13 @@ uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() // ________ AccessibleBase::XEventListener ________ void SAL_CALL AccessibleBase::disposing( const lang::EventObject& /*Source*/ ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { } // ________ XAccessibleEventBroadcasters ________ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -936,7 +936,7 @@ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAcce } void SAL_CALL AccessibleBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index f480aa2fae98..82b08e6075a9 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -149,14 +149,14 @@ sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const // ________ XServiceInfo ________ OUString SAL_CALL AccessibleChartElement::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "AccessibleChartElement" ); } // ________ AccessibleChartElement::XAccessibleContext (overloaded) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return ObjectNameProvider::getNameForCID( GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument ); @@ -164,14 +164,14 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName() // ________ AccessibleChartElement::XAccessibleContext (overloaded) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return getToolTipText(); } // ________ AccessibleChartElement::XAccessibleExtendedComponent ________ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { CheckDisposeState(); @@ -194,13 +194,13 @@ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont() } OUString SAL_CALL AccessibleChartElement::getTitledBorderText() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString(); } OUString SAL_CALL AccessibleChartElement::getToolTipText() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { CheckDisposeState(); @@ -210,55 +210,55 @@ OUString SAL_CALL AccessibleChartElement::getToolTipText() // ________ XAccessibleComponent ________ sal_Bool SAL_CALL AccessibleChartElement::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::containsPoint( aPoint ); } Reference< XAccessible > SAL_CALL AccessibleChartElement::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getAccessibleAtPoint( aPoint ); } awt::Rectangle SAL_CALL AccessibleChartElement::getBounds() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getBounds(); } awt::Point SAL_CALL AccessibleChartElement::getLocation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getLocation(); } awt::Point SAL_CALL AccessibleChartElement::getLocationOnScreen() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getLocationOnScreen(); } awt::Size SAL_CALL AccessibleChartElement::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getSize(); } void SAL_CALL AccessibleChartElement::grabFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::grabFocus(); } sal_Int32 SAL_CALL AccessibleChartElement::getForeground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::getForeground(); } sal_Int32 SAL_CALL AccessibleChartElement::getBackground() - throw (uno::RuntimeException) + 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 d699ef7925c3..d8a824ed9965 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -86,36 +86,36 @@ public: // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTitledBorderText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getToolTipText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // the following interface is implemented in AccessibleBase, however it is // also a (non-virtual) base class of XAccessibleExtendedComponent Thus // these methods have to be overloaded and forward to AccessibleBase // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: bool m_bHasText; diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 07e5714fe145..94e9120fe37d 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -84,14 +84,14 @@ AccessibleChartShape::~AccessibleChartShape() // ________ XServiceInfo ________ OUString AccessibleChartShape::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return OUString( "AccessibleChartShape" ); } // ________ XAccessibleContext ________ sal_Int32 AccessibleChartShape::getAccessibleChildCount() - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int32 nCount(0); if ( m_pAccShape ) @@ -102,7 +102,7 @@ sal_Int32 AccessibleChartShape::getAccessibleChildCount() } Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, RuntimeException) + throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { Reference< XAccessible > xChild; if ( m_pAccShape ) @@ -113,7 +113,7 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i ) } sal_Int16 AccessibleChartShape::getAccessibleRole() - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int16 nRole(0); if ( m_pAccShape ) @@ -124,7 +124,7 @@ sal_Int16 AccessibleChartShape::getAccessibleRole() } OUString AccessibleChartShape::getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { OUString aDescription; if ( m_pAccShape ) @@ -135,7 +135,7 @@ OUString AccessibleChartShape::getAccessibleDescription() } OUString AccessibleChartShape::getAccessibleName() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { OUString aName; if ( m_pAccShape ) @@ -147,7 +147,7 @@ OUString AccessibleChartShape::getAccessibleName() // ________ XAccessibleComponent ________ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bReturn = sal_False; if ( m_pAccShape ) @@ -158,7 +158,7 @@ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint ) } Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< XAccessible > xResult; if ( m_pAccShape ) @@ -169,7 +169,7 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt:: } awt::Rectangle AccessibleChartShape::getBounds() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Rectangle aBounds; if ( m_pAccShape ) @@ -180,7 +180,7 @@ awt::Rectangle AccessibleChartShape::getBounds() } awt::Point AccessibleChartShape::getLocation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Point aLocation; if ( m_pAccShape ) @@ -191,7 +191,7 @@ awt::Point AccessibleChartShape::getLocation() } awt::Point AccessibleChartShape::getLocationOnScreen() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Point aLocation; if ( m_pAccShape ) @@ -202,7 +202,7 @@ awt::Point AccessibleChartShape::getLocationOnScreen() } awt::Size AccessibleChartShape::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Size aSize; if ( m_pAccShape ) @@ -213,13 +213,13 @@ awt::Size AccessibleChartShape::getSize() } void AccessibleChartShape::grabFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return AccessibleBase::grabFocus(); } sal_Int32 AccessibleChartShape::getForeground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Int32 nColor(0); if ( m_pAccShape ) @@ -230,7 +230,7 @@ sal_Int32 AccessibleChartShape::getForeground() } sal_Int32 AccessibleChartShape::getBackground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Int32 nColor(0); if ( m_pAccShape ) @@ -242,7 +242,7 @@ sal_Int32 AccessibleChartShape::getBackground() // ________ XAccessibleExtendedComponent ________ Reference< awt::XFont > AccessibleChartShape::getFont() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< awt::XFont > xFont; if ( m_pAccShape ) @@ -253,7 +253,7 @@ Reference< awt::XFont > AccessibleChartShape::getFont() } OUString AccessibleChartShape::getTitledBorderText() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString aText; if ( m_pAccShape ) @@ -264,7 +264,7 @@ OUString AccessibleChartShape::getTitledBorderText() } OUString AccessibleChartShape::getToolTipText() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { OUString aText; if ( m_pAccShape ) diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index eb972ee15204..bd3e2d32e96d 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -50,40 +50,40 @@ public: // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleContext ________ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getTitledBorderText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getToolTipText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::accessibility::AccessibleShape* m_pAccShape; diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 8125ab90521e..62e23c6fe63a 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -104,39 +104,39 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const // ________ XAccessibleContext ________ OUString SAL_CALL AccessibleChartView::getAccessibleName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return SCH_RESSTR(STR_OBJECT_DIAGRAM); } OUString SAL_CALL AccessibleChartView::getAccessibleDescription() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getAccessibleName(); } Reference< XAccessible > SAL_CALL AccessibleChartView::getAccessibleParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< XAccessible >( m_xParent ); } sal_Int32 SAL_CALL AccessibleChartView::getAccessibleIndexInParent() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { return AccessibleRole::DOCUMENT; } // ________ XAccessibleComponent ________ awt::Rectangle SAL_CALL AccessibleChartView::getBounds() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Rectangle aResult( GetWindowPosSize()); Reference< XAccessible > xParent( m_xParent ); @@ -154,7 +154,7 @@ awt::Rectangle SAL_CALL AccessibleChartView::getBounds() } awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Rectangle aBounds( getBounds()); awt::Point aResult; @@ -173,7 +173,7 @@ awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen() // lang::XInitialization void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments ) - throw (uno::Exception, uno::RuntimeException) + 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 @@ -348,7 +348,7 @@ ExplicitValueProvider* AccessibleChartView::getExplicitValueProvider() // view::XSelectionChangeListener void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*rEvent*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< view::XSelectionSupplier > xSelectionSupplier; { @@ -379,7 +379,7 @@ void SAL_CALL AccessibleChartView::disposing() // XEventListener void SAL_CALL AccessibleChartView::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index e9c71af0709f..6fcf15d9dacc 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -55,7 +55,7 @@ AccessibleTextHelper::~AccessibleTextHelper() // ____ XInitialization ____ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArguments ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OUString aCID; Reference< XAccessible > xEventSource; @@ -101,7 +101,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg // ____ XAccessibleContext ____ ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleChildCount() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_pTextHelper ) { @@ -113,7 +113,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sal_Int32 i ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( m_pTextHelper ) { @@ -124,49 +124,49 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa } Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessible >(); } ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return -1; } ::sal_Int16 SAL_CALL AccessibleTextHelper::getAccessibleRole() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return AccessibleRole::UNKNOWN; } OUString SAL_CALL AccessibleTextHelper::getAccessibleDescription() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return OUString(); } OUString SAL_CALL AccessibleTextHelper::getAccessibleName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return OUString(); } Reference< XAccessibleRelationSet > SAL_CALL AccessibleTextHelper::getAccessibleRelationSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessibleRelationSet >(); } Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleStateSet() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessibleStateSet >(); @@ -174,7 +174,7 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleSta lang::Locale SAL_CALL AccessibleTextHelper::getLocale() throw (IllegalAccessibleComponentStateException, - uno::RuntimeException) + 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 394d34825367..5efb1f06d74c 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -87,40 +87,40 @@ AreaWrapper::~AreaWrapper() // ____ XShape ____ awt::Point SAL_CALL AreaWrapper::getPosition() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return awt::Point(0,0); } void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set position of chart area" ); } awt::Size SAL_CALL AreaWrapper::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetPageSize(); } void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ ) throw (beans::PropertyVetoException, - uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartArea" ); } // ____ XComponent ____ void SAL_CALL AreaWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -131,14 +131,14 @@ void SAL_CALL AreaWrapper::dispose() void SAL_CALL AreaWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AreaWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index 2e9d841c638d..f453b9d7a780 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -56,28 +56,28 @@ public: // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index fd44cce3b3e2..3c07f886339d 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -405,7 +405,7 @@ AxisWrapper::~AxisWrapper() } // ____ chart::XAxis ____ -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException, std::exception) { if( !m_xAxisTitle.is() ) { @@ -434,7 +434,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno } return m_xAxisTitle; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException, std::exception) { if( !m_xMajorGrid.is() ) { @@ -457,7 +457,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno } return m_xMajorGrid; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException, std::exception) { if( !m_xMinorGrid.is() ) { @@ -483,20 +483,20 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno // ____ XShape ____ awt::Point SAL_CALL AxisWrapper::getPosition() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set position of Axis" ); } awt::Size SAL_CALL AxisWrapper::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Size aSize( m_spChart2ModelContact->GetAxisSize( this->getAxis() ) ); return aSize; @@ -504,21 +504,21 @@ awt::Size SAL_CALL AxisWrapper::getSize() void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of Axis" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AxisWrapper::getShapeType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("com.sun.star.chart.ChartAxis"); } // ____ XNumberFormatsSupplier ____ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSettings() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -528,7 +528,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSetti } uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -556,7 +556,7 @@ void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDim // ____ XComponent ____ void SAL_CALL AxisWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -570,14 +570,14 @@ void SAL_CALL AxisWrapper::dispose() void SAL_CALL AxisWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AxisWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index b7424ad278c3..989c0b8078a8 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -77,41 +77,41 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ chart::XAxis ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XNumberFormatsSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 35afa7c20d37..c3f39cee5b89 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -416,7 +416,7 @@ ChartDataWrapper::~ChartDataWrapper() // ____ XChartDataArray (read)____ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -424,7 +424,7 @@ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() return Sequence< Sequence< double > >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -432,7 +432,7 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() return Sequence< OUString >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -441,14 +441,14 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() } // ____ XComplexDescriptionAccess (read) ____ -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) return m_xDataAccess->getComplexRowDescriptions(); return Sequence< Sequence< OUString > >(); } -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -457,14 +457,14 @@ Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDesc } // ____ XAnyDescriptionAccess (read) ____ -Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) { 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) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -473,7 +473,7 @@ Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescript } // ____ XDateCategories (read) ____ -Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException) +Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException, std::exception) { initDataAccess(); Reference< XDateCategories > xDateCategories( m_xDataAccess, uno::UNO_QUERY ); @@ -484,50 +484,50 @@ Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::Ru // ____ XChartDataArray (write)____ void SAL_CALL ChartDataWrapper::setData( const Sequence< Sequence< double > >& rData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { lcl_DataOperator aOperator( rData ); applyData( aOperator ); } void SAL_CALL ChartDataWrapper::setRowDescriptions( const Sequence< OUString >& rRowDescriptions ) - throw (uno::RuntimeException) + 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) + 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) +void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception) { lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) { 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) +void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception) { lcl_AnyRowDescriptionsOperator aOperator( rRowDescriptions ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) { lcl_AnyColumnDescriptionsOperator aOperator( rColumnDescriptions ); applyData( aOperator ); } // ____ XDateCategories (write) ____ -void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException) +void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); @@ -540,7 +540,7 @@ void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDa void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener( const uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( aListener ); } @@ -548,19 +548,19 @@ void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener( void SAL_CALL ChartDataWrapper::removeChartDataChangeEventListener( const uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } double SAL_CALL ChartDataWrapper::getNotANumber() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return DBL_MIN; } sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return DBL_MIN == nNumber || ::rtl::math::isNan( nNumber ) @@ -569,7 +569,7 @@ sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) // ____ XComponent ____ void SAL_CALL ChartDataWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); m_xDataAccess=0; @@ -577,21 +577,21 @@ void SAL_CALL ChartDataWrapper::dispose() void SAL_CALL ChartDataWrapper::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL ChartDataWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 263c3df4799b..370df448889f 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -59,84 +59,84 @@ public: protected: // ____ XDateCategories ____ - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAnyDescriptionAccess ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAnyRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAnyColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual double SAL_CALL getNotANumber() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); void fireChartDataChangeEvent( ::com::sun::star::chart::ChartDataChangeEvent& aEvent ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 3d6f4c4dbfba..b6242a4a1070 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -710,7 +710,7 @@ ChartDocumentWrapper::~ChartDocumentWrapper() // ____ XInterface (for new interfaces) ____ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xDelegator.is()) // calls queryAggregation if the delegator doesn't know aType @@ -721,7 +721,7 @@ 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) + throw (uno::RuntimeException, std::exception) { if( !m_xTitle.is() ) { @@ -732,7 +732,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xSubTitle.is() ) { @@ -743,7 +743,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xLegend.is()) { @@ -755,7 +755,7 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() } Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xArea.is()) { @@ -767,7 +767,7 @@ Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() } Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xDiagram.is() ) { @@ -785,7 +785,7 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() } void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< util::XRefreshable > xAddIn( xDiagram, uno::UNO_QUERY ); if( xAddIn.is() ) @@ -818,7 +818,7 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi } Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xChartData.is() ) { @@ -830,7 +830,7 @@ Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() } void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& xNewData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !xNewData.is() ) return; @@ -845,7 +845,7 @@ 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) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -854,7 +854,7 @@ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( } OUString SAL_CALL ChartDocumentWrapper::getURL() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -863,7 +863,7 @@ OUString SAL_CALL ChartDocumentWrapper::getURL() } Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -872,7 +872,7 @@ Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() } void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -881,7 +881,7 @@ void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::X void SAL_CALL ChartDocumentWrapper::disconnectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -889,7 +889,7 @@ void SAL_CALL ChartDocumentWrapper::disconnectController( } void SAL_CALL ChartDocumentWrapper::lockControllers() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -897,7 +897,7 @@ void SAL_CALL ChartDocumentWrapper::lockControllers() } void SAL_CALL ChartDocumentWrapper::unlockControllers() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -905,7 +905,7 @@ void SAL_CALL ChartDocumentWrapper::unlockControllers() } sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -914,7 +914,7 @@ sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() } Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentController() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -925,7 +925,7 @@ Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentControl void SAL_CALL ChartDocumentWrapper::setCurrentController( const Reference< frame::XController >& Controller ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -933,7 +933,7 @@ void SAL_CALL ChartDocumentWrapper::setCurrentController( } Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -943,7 +943,7 @@ Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection( // ____ XComponent ____ void SAL_CALL ChartDocumentWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) throw lang::DisposedException("ChartDocumentWrapper is disposed", @@ -1117,7 +1117,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const } void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1125,7 +1125,7 @@ void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEv } void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1134,7 +1134,7 @@ void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang:: // ____ XDrawPageSupplier ____ uno::Reference< drawing::XDrawPage > SAL_CALL ChartDocumentWrapper::getDrawPage() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return this->impl_getDrawPage(); } @@ -1149,7 +1149,7 @@ uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() co uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; @@ -1426,7 +1426,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" ); (void)(Arguments); @@ -1435,7 +1435,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW } uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tServiceNameMap & rMap = lcl_getStaticServiceNameMap(); uno::Sequence< OUString > aResult( rMap.size()); @@ -1451,7 +1451,7 @@ uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceName // ____ XAggregation ____ void SAL_CALL ChartDocumentWrapper::setDelegator( const uno::Reference< uno::XInterface >& rDelegator ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) { @@ -1482,7 +1482,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator( } uno::Any SAL_CALL ChartDocumentWrapper::queryAggregation( const uno::Type& rType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ChartDocumentWrapper_Base::queryInterface( rType ); } diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 21b269ab1aac..222b0ef24633 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -459,7 +459,7 @@ DataSeriesPointWrapper::DataSeriesPointWrapper( } void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw ( uno::Exception, uno::RuntimeException) + 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"); @@ -504,7 +504,7 @@ DataSeriesPointWrapper::~DataSeriesPointWrapper() // ____ XComponent ____ void SAL_CALL DataSeriesPointWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -515,21 +515,21 @@ void SAL_CALL DataSeriesPointWrapper::dispose() void SAL_CALL DataSeriesPointWrapper::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DataSeriesPointWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } @@ -605,7 +605,7 @@ awt::Size DataSeriesPointWrapper::getCurrentSizeForReference() //XPropertyState beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -635,7 +635,7 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU } void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( m_eType == DATA_SERIES ) WrappedPropertySet::setPropertyToDefault( rPropertyName ); @@ -646,7 +646,7 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPro } } Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; try @@ -748,7 +748,7 @@ 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) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if(rPropertyName == "Lines") { @@ -809,7 +809,7 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert } Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rPropertyName ) - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( m_eType == DATA_POINT ) { diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index 1c8aceaf3805..db2ee7e80090 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -78,7 +78,7 @@ public: // ___lang::XInitialization___ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); //ReferenceSizePropertyProvider virtual void updateReferenceSize(); @@ -88,30 +88,30 @@ public: protected: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //own methods ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeries(); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index cceaf7526c4a..1dc2dd19fda4 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -633,7 +633,7 @@ DiagramWrapper::~DiagramWrapper() // ____ XDiagram ____ OUString SAL_CALL DiagramWrapper::getDiagramType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OUString aRet; @@ -681,7 +681,7 @@ OUString SAL_CALL DiagramWrapper::getDiagramType() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataRowProperties( sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -702,7 +702,7 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nCol < 0 || nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -725,14 +725,14 @@ Reference< // ____ XShape (base of XDiagram) ____ awt::Point SAL_CALL DiagramWrapper::getPosition() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -757,7 +757,7 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL DiagramWrapper::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { awt::Size aSize = ToSize( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() ); return aSize; @@ -765,7 +765,7 @@ awt::Size SAL_CALL DiagramWrapper::getSize() void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -792,14 +792,14 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL DiagramWrapper::getShapeType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.Diagram" ); } // ____ XDiagramPositioning ____ -void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::RuntimeException) +void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); @@ -809,7 +809,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::Runti xDiaProps->setPropertyValue( "RelativePosition", Any() ); } } -::sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -821,7 +821,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::Runti } return true; } -void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException) +void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -829,7 +829,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) +::sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -845,11 +845,11 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan } return false; } -awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) throw (uno::RuntimeException) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetDiagramRectangleExcludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -857,24 +857,24 @@ 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) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetDiagramRectangleIncludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); awt::Rectangle aRect( m_spChart2ModelContact->SubstractAxisTitleSizes(rPositionRect) ); DiagramWrapper::setDiagramPositionIncludingAxes( aRect ); } -::com::sun::star::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetDiagramRectangleIncludingTitle(); } // ____ XAxisSupplier ____ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -899,7 +899,7 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) } Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -919,7 +919,7 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensi // ____ XAxisZSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -929,7 +929,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -939,7 +939,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -949,7 +949,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xZAxis.is()) m_xZAxis = new AxisWrapper( AxisWrapper::Z_AXIS, m_spChart2ModelContact ); @@ -958,7 +958,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() // ____ XTwoAxisXSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xSecondXAxis.is()) m_xSecondXAxis = new AxisWrapper( AxisWrapper::SECOND_X_AXIS, m_spChart2ModelContact ); @@ -967,7 +967,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -977,7 +977,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xXAxis.is()) m_xXAxis = new AxisWrapper( AxisWrapper::X_AXIS, m_spChart2ModelContact ); @@ -985,7 +985,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -995,7 +995,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -1006,7 +1006,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() // ____ XTwoAxisYSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xSecondYAxis.is()) m_xSecondYAxis = new AxisWrapper( AxisWrapper::SECOND_Y_AXIS, m_spChart2ModelContact ); @@ -1015,7 +1015,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1025,7 +1025,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xYAxis.is()) m_xYAxis = new AxisWrapper( AxisWrapper::Y_AXIS, m_spChart2ModelContact ); @@ -1033,7 +1033,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1043,7 +1043,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1054,7 +1054,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() // ____ XSecondAxisTitleSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(0) ); @@ -1064,7 +1064,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() } Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(1) ); @@ -1076,7 +1076,7 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() // ____ XStatisticDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getUpBar() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xUpBarWrapper.is() ) { @@ -1087,7 +1087,7 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDownBar() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xDownBarWrapper.is() ) { @@ -1098,7 +1098,7 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getMinMaxLine() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xMinMaxLineWrapper.is() ) { @@ -1109,7 +1109,7 @@ Reference< // ____ X3DDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xWall.is() ) { @@ -1120,7 +1120,7 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getFloor() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( !m_xFloor.is() ) { @@ -1131,7 +1131,7 @@ Reference< // ____ X3DDefaultSetter ____ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1139,7 +1139,7 @@ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() } void SAL_CALL DiagramWrapper::setDefaultRotation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1147,7 +1147,7 @@ void SAL_CALL DiagramWrapper::setDefaultRotation() } void SAL_CALL DiagramWrapper::setDefaultIllumination() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1156,7 +1156,7 @@ void SAL_CALL DiagramWrapper::setDefaultIllumination() // ____ XComponent ____ void SAL_CALL DiagramWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); @@ -1178,14 +1178,14 @@ void SAL_CALL DiagramWrapper::dispose() void SAL_CALL DiagramWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DiagramWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -2000,14 +2000,14 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue // ____ XDiagramProvider ____ Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->getChart2Diagram(); } void SAL_CALL DiagramWrapper::setDiagram( const Reference< chart2::XDiagram >& /*xDiagram*/ ) - throw (uno::RuntimeException) + 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" ); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 32cfa14092d6..8ea94cbdd0ff 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -86,151 +86,151 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDiagram ____ virtual OUString SAL_CALL getDiagramType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShape (base of XDiagram) ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxisSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxisZSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getZAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getZMainGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getZHelpGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getZAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTwoAxisXSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getSecondaryXAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getXAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXMainGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXHelpGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTwoAxisYSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getSecondaryYAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getYAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYAxis() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYHelpGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYMainGrid() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XSecondAxisTitleSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getSecondXAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getSecondYAxisTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XStatisticDisplay ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getUpBar() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDownBar() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinMaxLine() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ X3DDisplay ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getWall() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getFloor() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDiagramPositioning ____ - virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDiagramPositionIncludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDiagramPositionIncludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDiagramProvider ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL getDiagram() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 412dc0a2ac12..57efc982debc 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -113,7 +113,7 @@ void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDime // ____ XComponent ____ void SAL_CALL GridWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -123,14 +123,14 @@ void SAL_CALL GridWrapper::dispose() void SAL_CALL GridWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL GridWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index 966501baa3c0..6de2a04153b2 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -66,13 +66,13 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 9153da8da659..c275e3796797 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -286,13 +286,13 @@ LegendWrapper::~LegendWrapper() // ____ XShape ____ awt::Point SAL_CALL LegendWrapper::getPosition() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendPosition(); } void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -308,14 +308,14 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL LegendWrapper::getSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendSize(); } void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -333,14 +333,14 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL LegendWrapper::getShapeType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartLegend" ); } // ____ XComponent ____ void SAL_CALL LegendWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -351,14 +351,14 @@ void SAL_CALL LegendWrapper::dispose() void SAL_CALL LegendWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL LegendWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 07f61462d30a..eb1bb481e824 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -64,28 +64,28 @@ public: // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index b25c0d108659..841df09ad2c1 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -136,7 +136,7 @@ MinMaxLineWrapper::~MinMaxLineWrapper() // ____ XComponent ____ void SAL_CALL MinMaxLineWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -144,14 +144,14 @@ void SAL_CALL MinMaxLineWrapper::dispose() void SAL_CALL MinMaxLineWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL MinMaxLineWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -163,13 +163,13 @@ void SAL_CALL MinMaxLineWrapper::removeEventListener( //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo() - throw (uno::RuntimeException) + 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) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropSet(0); @@ -206,7 +206,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName } } uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -248,22 +248,22 @@ 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) + 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) + 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) + 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -271,7 +271,7 @@ 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) + 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) + throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -306,27 +306,27 @@ 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) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) ) return beans::PropertyState_DEFAULT_VALUE; @@ -340,7 +340,7 @@ 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) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -355,13 +355,13 @@ uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertySta return aRetSeq; } void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) ); @@ -373,7 +373,7 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rProper //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticMinMaxLineWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index e4982af08044..0a56a4cdc281 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -65,44 +65,44 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 9ca382f98f1b..3d3dee6c3191 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -215,13 +215,13 @@ TitleWrapper::~TitleWrapper() // ____ XShape ____ awt::Point SAL_CALL TitleWrapper::getPosition() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetTitlePosition( this->getTitleObject() ); } void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropertySet( this->getInnerPropertySet() ); if(xPropertySet.is()) @@ -237,28 +237,28 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL TitleWrapper::getSize() - throw (uno::RuntimeException) + 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) + uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of title" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL TitleWrapper::getShapeType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartTitle" ); } // ____ XComponent ____ void SAL_CALL TitleWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -269,14 +269,14 @@ void SAL_CALL TitleWrapper::dispose() void SAL_CALL TitleWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL TitleWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -346,7 +346,7 @@ 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) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -358,7 +358,7 @@ void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, con } Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); @@ -370,7 +370,7 @@ Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) } beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -393,7 +393,7 @@ beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rP return aState; } void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -405,7 +405,7 @@ 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -429,7 +429,7 @@ 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -442,7 +442,7 @@ 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index bb087ce0faf4..dc3d277a010f 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -64,28 +64,28 @@ public: protected: // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // character properties have to be handled differently (via the XFormattedString elements) void getFastCharacterPropertyValue( sal_Int32 nHandle, ::com::sun::star::uno::Any& rValue ); @@ -93,16 +93,16 @@ protected: throw (::com::sun::star::uno::Exception); // ____ WrappedPropertySet ____ - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index f45a9b5e0b42..e3be3b99515e 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -139,7 +139,7 @@ UpDownBarWrapper::~UpDownBarWrapper() // ____ XComponent ____ void SAL_CALL UpDownBarWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -147,14 +147,14 @@ void SAL_CALL UpDownBarWrapper::dispose() void SAL_CALL UpDownBarWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL UpDownBarWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -166,12 +166,12 @@ void SAL_CALL UpDownBarWrapper::removeEventListener( //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo() - throw (uno::RuntimeException) + 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) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropSet(0); @@ -193,7 +193,7 @@ 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -219,22 +219,22 @@ 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) + 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) + 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) + 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -242,7 +242,7 @@ 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) + 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) + throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -275,24 +275,24 @@ 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) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); uno::Any aValue( this->getPropertyValue( rPropertyName ) ); @@ -303,7 +303,7 @@ 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) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -318,13 +318,13 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat return aRetSeq; } void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( getInfoHelper().getHandleByName( rPropertyName ) ) ); @@ -336,7 +336,7 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropert //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 8f7fd7702d7a..579deb21bcdd 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -64,44 +64,44 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 3ff1d7709b3d..701b86c9e881 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -95,7 +95,7 @@ WallFloorWrapper::~WallFloorWrapper() // ____ XComponent ____ void SAL_CALL WallFloorWrapper::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -106,14 +106,14 @@ void SAL_CALL WallFloorWrapper::dispose() void SAL_CALL WallFloorWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL WallFloorWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index e57f5cddea01..abb01b19a1be 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -53,13 +53,13 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index dcc65e2507fe..55944a08a9d6 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -41,21 +41,21 @@ RangeSelectionListener::~RangeSelectionListener() // ____ XRangeSelectionListener ____ void SAL_CALL RangeSelectionListener::done( const sheet::RangeSelectionEvent& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { m_rParent.listeningFinished( m_aRange ); } // ____ XEventListener ____ void SAL_CALL RangeSelectionListener::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException) + 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 b212b598efac..f958c7f469dd 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -46,7 +46,7 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() } } // lang::XServiceInfo -OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException) +OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException, std::exception) { return getImplementationName_Static(); } @@ -56,7 +56,7 @@ OUString ChartTypeUnoDlg::getImplementationName_Static() throw(uno::RuntimeExcep return CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME; } -::comphelper::StringSequence SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException) +::comphelper::StringSequence SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -67,7 +67,7 @@ uno::Sequence< OUString > ChartTypeUnoDlg::getSupportedServiceNames_Static() aSNS.getArray()[ 0 ] = CHART_TYPE_DIALOG_SERVICE_NAME; return aSNS; } -uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId( void ) throw( uno::RuntimeException ) +uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId( void ) throw( uno::RuntimeException, std::exception ) { static ::cppu::OImplementationId aId; return aId.getImplementationId(); @@ -89,7 +89,7 @@ Dialog* ChartTypeUnoDlg::createDialog(Window* _pParent) { return new ChartTypeDialog( _pParent, m_xChartModel, m_aContext ); } -uno::Reference SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException) +uno::Reference SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index b15a43f97fe2..d38280729ed0 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -74,7 +74,7 @@ APPHELPER_XSERVICEINFO_IMPL(CreationWizardUnoDlg,CHART_WIZARD_DIALOG_SERVICE_IMP } // XInterface -uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException) +uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException, std::exception) { return OComponentHelper::queryInterface( aType ); } @@ -86,7 +86,7 @@ void SAL_CALL CreationWizardUnoDlg::release() throw () { OComponentHelper::release(); } -uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) throw (uno::RuntimeException) +uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) throw (uno::RuntimeException, std::exception) { if (rType == ::getCppuType( (uno::Reference< ui::dialogs::XExecutableDialog > const *)0 )) { @@ -118,7 +118,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rTyp #define LCL_CPPUTYPE(t) (::getCppuType( reinterpret_cast< const uno::Reference *>(0))) -uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException) +uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException, std::exception) { static uno::Sequence< uno::Type > aTypeList; @@ -146,13 +146,13 @@ namespace class theCreationWizardUnoDlgImplementationId : public rtl::Static< UnoTunnelIdInit, theCreationWizardUnoDlgImplementationId > {}; } -uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw( uno::RuntimeException ) +uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId( void ) throw( uno::RuntimeException, std::exception ) { return theCreationWizardUnoDlgImplementationId::get().getSeq(); } // XTerminateListener -void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -164,18 +164,18 @@ void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& / } } -void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException, std::exception) { // we are going down, so dispose us! dispose(); } -void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { //Listener should deregister himself and relaese all references to the closing object. } -void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException) +void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException, std::exception) { } void CreationWizardUnoDlg::createDialogOnDemand() @@ -217,7 +217,7 @@ IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent*, pEvent ) return 0; } -sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException) +sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException, std::exception) { sal_Int16 nRet = RET_CANCEL; { @@ -233,7 +233,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) +void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException, std::exception) { const uno::Any* pArguments = aArguments.getConstArray(); for(sal_Int32 i=0; i SAL_CALL CreationWizardUnoDlg::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return 0; @@ -290,7 +290,7 @@ 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) + , lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( rPropertyName == "Position" ) { @@ -325,7 +325,7 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyN } uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRet; if( rPropertyName == "Position" ) @@ -365,25 +365,25 @@ 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) + 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) + 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) + 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) + 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 3c021d2b461f..6dce61bf60f6 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -222,11 +222,11 @@ protected: AccessibleUniqueId GetId() const; // ________ XComponent ________ - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) { WeakComponentImplHelperBase::removeEventListener(xListener); } // ________ WeakComponentImplHelper (XComponent::dispose) ________ @@ -234,35 +234,35 @@ protected: // ________ XAccessible ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleContext ________ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @return AccessibleRole.SHAPE virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleName() // throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleDescription() // throw (::com::sun::star::uno::RuntimeException); @@ -270,47 +270,47 @@ protected: // ________ XAccessibleComponent ________ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // has to be defined in derived classes virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XEventListener ________ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleEventBroadcaster ________ virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: enum eColorType diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index f3938c790fb8..31a43c08c8c3 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -77,29 +77,29 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ view::XSelectionChangeListener ____ - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XEventListener ________ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ________ XAccessibleComponent ________ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception); protected: // ________ AccessibleChartElement ________ diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 474530e367c2..6da06466ce70 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -67,32 +67,32 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XAccessibleContext ____ virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( ::sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); private: ::accessibility::AccessibleTextHelper * m_pTextHelper; diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 3dfac058dabe..fde19f4cd2b8 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -88,74 +88,74 @@ protected: // ____ chart::XChartDocument ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getSubTitle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getLegend() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getArea() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > SAL_CALL getDiagram() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL attachData( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData >& xData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModel ____ virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getURL() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL lockControllers() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL unlockControllers() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasControllersLocked() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XInterface (for new interfaces) ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ::utl::OEventListenerAdapter ____ virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ); @@ -163,30 +163,30 @@ protected: // ____ XDrawPageSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAggregation ____ virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rDelegator ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WrappedPropertySet ____ virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index 1226ef200153..bab90fb85f2f 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -52,13 +52,13 @@ public: protected: // ____ XRangeSelectionListener ____ virtual void SAL_CALL done( const ::com::sun::star::sheet::RangeSelectionEvent& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL aborted( const ::com::sun::star::sheet::RangeSelectionEvent& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: RangeSelectionListenerParent & m_rParent; diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index a7d02af8c7bf..70d5ce8515e3 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -49,13 +49,13 @@ private: virtual Dialog* createDialog(Window* _pParent); // XTypeProvider - virtual com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // OPropertyArrayUsageHelper diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 1e9d019939a0..b2d772b4ff67 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -54,40 +54,40 @@ public: virtual ~CreationWizardUnoDlg(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg) // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); DECL_LINK( DialogEventHdl, VclWindowEvent* ); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index f52c435684f1..401351f970c3 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -330,7 +330,7 @@ uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static() void SAL_CALL ChartController::attachFrame( const uno::Reference& xFrame ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -495,7 +495,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XModel > & xModel ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { impl_invalidateAccessible(); @@ -588,7 +588,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo } uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //provides access to owner frame of this controller //return the frame containing this controller @@ -597,7 +597,7 @@ uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame() } uno::Reference< frame::XModel > SAL_CALL ChartController::getModel() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //provides access to currently attached model //returns the currently attached model @@ -611,7 +611,7 @@ uno::Reference< frame::XModel > SAL_CALL ChartController::getModel() } uno::Any SAL_CALL ChartController::getViewData() - throw(uno::RuntimeException) + 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 @@ -630,7 +630,7 @@ uno::Any SAL_CALL ChartController::getViewData() void SAL_CALL ChartController::restoreViewData( const uno::Any& /* Value */ ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //restores the view status using the data gotten from a previous call to XController::getViewData() @@ -642,7 +642,7 @@ void SAL_CALL ChartController::restoreViewData( } sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //is called to prepare the controller for closing the view //bSuspend==true: force the controller to suspend his work @@ -701,7 +701,7 @@ void ChartController::impl_deleteDrawViewController() // XComponent (base of XController) void SAL_CALL ChartController::dispose() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { try { @@ -802,7 +802,7 @@ void SAL_CALL ChartController::dispose() void SAL_CALL ChartController::addEventListener( const uno::Reference& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? @@ -814,7 +814,7 @@ void SAL_CALL ChartController::addEventListener( void SAL_CALL ChartController::removeEventListener( const uno::Reference& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( m_aLifeTimeManager.impl_isDisposed(false) ) @@ -828,7 +828,7 @@ void SAL_CALL ChartController::removeEventListener( void SAL_CALL ChartController::queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) - throw(util::CloseVetoException, uno::RuntimeException) + throw(util::CloseVetoException, uno::RuntimeException, std::exception) { //do not use the m_aControllerMutex here because this call is not allowed to block @@ -860,7 +860,7 @@ void SAL_CALL ChartController::queryClosing( void SAL_CALL ChartController::notifyClosing( const lang::EventObject& rSource ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //Listener should deregister himself and relaese all references to the closing object. @@ -909,7 +909,7 @@ bool ChartController::impl_releaseThisModel( // util::XEventListener (base of XCloseListener) void SAL_CALL ChartController::disposing( const lang::EventObject& rSource ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( !impl_releaseThisModel( rSource.Source )) { @@ -922,7 +922,7 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, sal_Int16 eLayoutEvent, const uno::Any& /* aInfo */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( eLayoutEvent == frame::LayoutManagerEvents::MERGEDMENUBAR ) { @@ -1003,7 +1003,7 @@ uno::Reference SAL_CALL const util::URL& rURL, const OUString& rTargetFrameName, sal_Int32 /* nSearchFlags */) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if ( !m_aLifeTimeManager.impl_isDisposed() && getModel().is() ) { @@ -1016,7 +1016,7 @@ uno::Reference SAL_CALL uno::Sequence > ChartController::queryDispatches( const uno::Sequence& xDescripts ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if ( !m_aLifeTimeManager.impl_isDisposed() ) { @@ -1214,7 +1214,7 @@ void SAL_CALL ChartController::dispatch( void SAL_CALL ChartController::addStatusListener( const uno::Reference& /* xControl */, const util::URL& /* aURL */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo } @@ -1222,7 +1222,7 @@ void SAL_CALL ChartController::addStatusListener( void SAL_CALL ChartController::removeStatusListener( const uno::Reference& /* xControl */, const util::URL& /* aURL */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo } @@ -1230,14 +1230,14 @@ void SAL_CALL ChartController::removeStatusListener( // XContextMenuInterception (optional interface) void SAL_CALL ChartController::registerContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor >& /* xInterceptor */) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo } void SAL_CALL ChartController::releaseContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor > & /* xInterceptor */) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo } @@ -1310,7 +1310,7 @@ void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward ) uno::Reference< uno::XInterface > SAL_CALL ChartController::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; @@ -1323,7 +1323,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartController::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& /* Arguments */ ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { // ignore Arguments return createInstance( ServiceSpecifier ); @@ -1331,7 +1331,7 @@ uno::Reference< uno::XInterface > SAL_CALL uno::Sequence< OUString > SAL_CALL ChartController::getAvailableServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aServiceNames(1); aServiceNames[0] = CHART_ACCESSIBLE_TEXT_SERVICE_NAME; @@ -1341,7 +1341,7 @@ uno::Sequence< OUString > SAL_CALL // ____ XModifyListener ____ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) + 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.hxx b/chart2/source/controller/main/ChartController.hxx index c0871e9f14c8..a65dc4d07dfa 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -165,43 +165,43 @@ public: virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL - getFrame() throw (::com::sun::star::uno::RuntimeException); + getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL - getModel() throw (::com::sun::star::uno::RuntimeException); + getModel() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL - getViewData() throw (::com::sun::star::uno::RuntimeException); + getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XComponent (base of XController) virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException); + dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XDispatchProvider (required interface) virtual ::com::sun::star::uno::Reference< @@ -209,43 +209,43 @@ public: queryDispatch( const ::com::sun::star::util::URL& rURL , const OUString& rTargetFrameName , sal_Int32 nSearchFlags) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor > & xDescripts) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::view::XSelectionSupplier (optional interface) virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& rSelection ) - throw ( com::sun::star::lang::IllegalArgumentException ); + throw ( com::sun::star::lang::IllegalArgumentException, std::exception ); virtual ::com::sun::star::uno::Any SAL_CALL - getSelection() throw (::com::sun::star::uno::RuntimeException); + getSelection() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< com::sun::star::view::XSelectionChangeListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< com::sun::star::view::XSelectionChangeListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::ui::XContextMenuInterception (optional interface) virtual void SAL_CALL registerContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL releaseContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //additional interfaces @@ -254,16 +254,16 @@ public: queryClosing( const ::com::sun::star::lang::EventObject& Source , sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException - , ::com::sun::star::uno::RuntimeException); + , ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XDispatch @@ -278,114 +278,114 @@ public: addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl , const ::com::sun::star::util::URL& aURL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl , const ::com::sun::star::util::URL& aURL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::awt::XWindow virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setVisible( sal_Bool Visible ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setEnable( sal_Bool Enable ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - setFocus() throw (::com::sun::star::uno::RuntimeException); + setFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang XMultiServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModifyListener virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::util::XModeChangeListener virtual void SAL_CALL modeChanged( @@ -398,7 +398,7 @@ public: const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // chart2::WindowController virtual void PrePaint(); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 9b75609a020d..d0fda11ad522 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -231,7 +231,7 @@ void SAL_CALL ChartController::setPosSize( sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference xWindow = m_xViewWindow; @@ -282,7 +282,7 @@ void SAL_CALL ChartController::setPosSize( } awt::Rectangle SAL_CALL ChartController::getPosSize() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo awt::Rectangle aRet(0, 0, 0, 0); @@ -295,7 +295,7 @@ awt::Rectangle SAL_CALL ChartController::getPosSize() } void SAL_CALL ChartController::setVisible( sal_Bool Visible ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -305,7 +305,7 @@ void SAL_CALL ChartController::setVisible( sal_Bool Visible ) } void SAL_CALL ChartController::setEnable( sal_Bool Enable ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -315,7 +315,7 @@ void SAL_CALL ChartController::setEnable( sal_Bool Enable ) } void SAL_CALL ChartController::setFocus() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -326,7 +326,7 @@ void SAL_CALL ChartController::setFocus() void SAL_CALL ChartController::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -337,7 +337,7 @@ void SAL_CALL ChartController::addWindowListener( void SAL_CALL ChartController::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -348,7 +348,7 @@ void SAL_CALL ChartController::removeWindowListener( void SAL_CALL ChartController::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -359,7 +359,7 @@ void SAL_CALL ChartController::addFocusListener( void SAL_CALL ChartController::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -370,7 +370,7 @@ void SAL_CALL ChartController::removeFocusListener( void SAL_CALL ChartController::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -381,7 +381,7 @@ void SAL_CALL ChartController::addKeyListener( void SAL_CALL ChartController::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -392,7 +392,7 @@ void SAL_CALL ChartController::removeKeyListener( void SAL_CALL ChartController::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -403,7 +403,7 @@ void SAL_CALL ChartController::addMouseListener( void SAL_CALL ChartController::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -414,7 +414,7 @@ void SAL_CALL ChartController::removeMouseListener( void SAL_CALL ChartController::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -425,7 +425,7 @@ void SAL_CALL ChartController::addMouseMotionListener( void SAL_CALL ChartController::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -436,7 +436,7 @@ void SAL_CALL ChartController::removeMouseMotionListener( void SAL_CALL ChartController::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -447,7 +447,7 @@ void SAL_CALL ChartController::addPaintListener( void SAL_CALL ChartController::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -1594,7 +1594,7 @@ bool ChartController::requestQuickHelp( // XSelectionSupplier (optional interface) sal_Bool SAL_CALL ChartController ::select( const uno::Any& rSelection ) - throw( lang::IllegalArgumentException ) + throw( lang::IllegalArgumentException, std::exception ) { bool bSuccess = false; @@ -1646,7 +1646,7 @@ bool ChartController::requestQuickHelp( } uno::Any SAL_CALL ChartController -::getSelection() throw(uno::RuntimeException) +::getSelection() throw(uno::RuntimeException, std::exception) { uno::Any aReturn; if ( m_aSelection.hasSelection() ) @@ -1668,7 +1668,7 @@ bool ChartController::requestQuickHelp( void SAL_CALL ChartController ::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? @@ -1681,7 +1681,7 @@ bool ChartController::requestQuickHelp( void SAL_CALL ChartController ::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener > & xListener ) - throw(uno::RuntimeException) + 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 9d06b6aebb29..f0b5fed3fa73 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -71,7 +71,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT sal_Bool SAL_CALL ChartFrameLoader ::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor , const uno::Reference& xFrame ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { //@todo ? need to add as terminate listener to desktop? @@ -177,7 +177,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT } void SAL_CALL ChartFrameLoader -::cancel() throw (uno::RuntimeException) +::cancel() throw (uno::RuntimeException, std::exception) { m_oCancelFinished.reset(); m_bCancelRequired = sal_True; diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index bd37644a12b7..75959c134289 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -64,10 +64,10 @@ public: ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL - cancel() throw (::com::sun::star::uno::RuntimeException); + cancel() throw (::com::sun::star::uno::RuntimeException, std::exception); }; } //namespace chart diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index cee92934ece5..6b060b76f9f1 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -88,11 +88,11 @@ void SAL_CALL CommandDispatch::disposing() // ____ XDispatch ____ void SAL_CALL CommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) {} void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tListenerMap::iterator aIt( m_aListeners.find( URL.Complete )); if( aIt == m_aListeners.end()) @@ -108,7 +108,7 @@ 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) + throw (uno::RuntimeException, std::exception) { tListenerMap::iterator aIt( m_aListeners.find( URL.Complete )); if( aIt != m_aListeners.end()) @@ -117,14 +117,14 @@ void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XSt // ____ XModifyListener ____ void SAL_CALL CommandDispatch::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { fireAllStatusEvents( 0 ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL CommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + 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 8e672b693c11..5555edf47952 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -101,15 +101,15 @@ protected: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& Control, const ::com::sun::star::util::URL& URL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& Control, const ::com::sun::star::util::URL& URL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -118,12 +118,12 @@ protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index d88a263af8fb..07fdf49a0791 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -744,7 +744,7 @@ void ControllerCommandDispatch::fireStatusEvent( void SAL_CALL ControllerCommandDispatch::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( commandAvailable( URL.Complete )) m_xDispatch->dispatch( URL, Arguments ); @@ -761,7 +761,7 @@ void SAL_CALL ControllerCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xController.clear(); m_xDispatch.clear(); @@ -770,7 +770,7 @@ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* // ____ XModifyListener ____ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bUpdateCommandAvailability = false; @@ -796,7 +796,7 @@ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEve // ____ XSelectionChangeListener ____ void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // Update the "ControllerState" Struct. if( m_apControllerState.get() && m_xController.is()) diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index 84516d2175d2..ca321497da4c 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -70,7 +70,7 @@ protected: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -79,7 +79,7 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void fireStatusEvent( const OUString & rURL, @@ -88,12 +88,12 @@ protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: void fireStatusEventForURLImpl( diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 5a46b7b199f3..d8d8b956345d 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -227,7 +227,7 @@ void DrawCommandDispatch::disposing() // XEventListener void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 976c40e48acd..0e2c87b50572 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -52,7 +52,7 @@ protected: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // state of a feature virtual FeatureState getState( const OUString& rCommand ); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index bb2459a58642..5205143ea541 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -262,7 +262,7 @@ ElementSelectorToolbarController::~ElementSelectorToolbarController() { } // XInterface -Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException) +Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = ToolboxController::queryInterface(_rType); if (!aReturn.hasValue()) @@ -277,11 +277,11 @@ void SAL_CALL ElementSelectorToolbarController::release() throw () { ToolboxController::release(); } -void SAL_CALL ElementSelectorToolbarController::initialize( const Sequence< Any >& rArguments ) throw (Exception, RuntimeException) +void SAL_CALL ElementSelectorToolbarController::initialize( const Sequence< Any >& rArguments ) throw (Exception, RuntimeException, std::exception) { ToolboxController::initialize(rArguments); } -void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException ) +void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException, std::exception ) { if( m_apSelectorListBox.get() ) { @@ -296,7 +296,7 @@ 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) + 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 4971cbb9c39f..c0c32ca22d55 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -83,16 +83,16 @@ public: APPHELPER_SERVICE_FACTORY_HELPER(ElementSelectorToolbarController) // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); // XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: //no default constructor diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index f530700f5372..e9721f1d738e 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -75,7 +75,7 @@ void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL, // XDispatch void FeatureCommandDispatchBase::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException) + 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 9d9a8ec2127a..90ffa284af7f 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -63,7 +63,7 @@ protected: // XDispatch virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void fireStatusEvent( const OUString& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener ); diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index f239af40ef2d..46f1afef7149 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -76,7 +76,7 @@ void ShapeController::disposing() // XEventListener void ShapeController::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index 501004643cb4..e7bb9f63388d 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -50,7 +50,7 @@ protected: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // state of a feature virtual FeatureState getState( const OUString& rCommand ); diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx index f5875d8edcda..284cf61a1efc 100644 --- a/chart2/source/controller/main/ShapeToolbarController.cxx +++ b/chart2/source/controller/main/ShapeToolbarController.cxx @@ -35,7 +35,7 @@ using ::com::sun::star::uno::Sequence; namespace chart { -OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException) +OUString ShapeToolbarController::getImplementationName() throw (uno::RuntimeException, std::exception) { return getImplementationName_Static(); } @@ -52,12 +52,12 @@ Sequence< OUString > ShapeToolbarController::getSupportedServiceNames_Static() t return aSupported; } -::sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) +::sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } -Sequence< OUString > ShapeToolbarController::getSupportedServiceNames() throw (uno::RuntimeException) +Sequence< OUString > ShapeToolbarController::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -82,7 +82,7 @@ ShapeToolbarController::~ShapeToolbarController() } // ::com::sun::star::uno::XInterface -uno::Any ShapeToolbarController::queryInterface( const uno::Type& rType ) throw (uno::RuntimeException) +uno::Any ShapeToolbarController::queryInterface( const uno::Type& rType ) throw (uno::RuntimeException, std::exception) { uno::Any aReturn = ToolboxController::queryInterface( rType ); if ( !aReturn.hasValue() ) @@ -103,7 +103,7 @@ void ShapeToolbarController::release() throw () } // ::com::sun::star::lang::XInitialization -void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments ) throw (uno::Exception, uno::RuntimeException) +void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) { ToolboxController::initialize( rArguments ); SolarMutexGuard aSolarMutexGuard; @@ -175,7 +175,7 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments } // ::com::sun::star::frame::XStatusListener -void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException ) +void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Event ) throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete ); @@ -217,7 +217,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even } // ::com::sun::star::frame::XToolbarController -Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException) +Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -232,7 +232,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno } // ::com::sun::star::frame::XSubToolbarController -::sal_Bool ShapeToolbarController::opensSubToolbar() throw (uno::RuntimeException) +::sal_Bool ShapeToolbarController::opensSubToolbar() throw (uno::RuntimeException, std::exception) { return ( m_nSlotId == SID_DRAWTBX_CS_BASIC || m_nSlotId == SID_DRAWTBX_CS_SYMBOL || @@ -242,7 +242,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno m_nSlotId == SID_DRAWTBX_CS_STAR ); } -OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException) +OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); @@ -254,7 +254,7 @@ OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeExceptio return OUString(); } -void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException) +void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -267,7 +267,7 @@ void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw } } -void ShapeToolbarController::updateImage() throw (uno::RuntimeException) +void ShapeToolbarController::updateImage() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 63ff304e959a..2a4068e5a615 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -57,35 +57,35 @@ public: virtual ~ShapeToolbarController(); // ::com::sun::star::uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() throw (); // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); // needed by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::frame::XSubToolbarController - virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 94acd29d7045..4fb944da814f 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -89,7 +89,7 @@ void StatusBarCommandDispatch::fireStatusEvent( void SAL_CALL StatusBarCommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing to do here } @@ -104,7 +104,7 @@ void SAL_CALL StatusBarCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifiable.clear(); m_xSelectionSupplier.clear(); @@ -112,7 +112,7 @@ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* S // ____ XModifyListener ____ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xModifiable.is()) m_bIsModified = m_xModifiable->isModified(); @@ -122,7 +122,7 @@ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEven // ____ XSelectionChangeListener ____ void SAL_CALL StatusBarCommandDispatch::selectionChanged( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) + 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 dc51ef64e378..1e16856f9d28 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -62,7 +62,7 @@ protected: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -71,12 +71,12 @@ protected: // ____ XModifyListener (override from CommandDispatch) ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void fireStatusEvent( const OUString & rURL, @@ -85,7 +85,7 @@ protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index 9371233c05ea..b09c070b0229 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -80,7 +80,7 @@ void SAL_CALL UndoElement::disposing() m_xDocumentModel.clear(); } -OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException, std::exception) { return m_sActionString; } @@ -95,12 +95,12 @@ void UndoElement::impl_toggleModelState() m_pModelClone = pNewClone; } -void SAL_CALL UndoElement::undo( ) throw (UndoFailedException, RuntimeException) +void SAL_CALL UndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception) { impl_toggleModelState(); } -void SAL_CALL UndoElement::redo( ) throw (UndoFailedException, RuntimeException) +void SAL_CALL UndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception) { impl_toggleModelState(); } @@ -118,21 +118,21 @@ ShapeUndoElement::~ShapeUndoElement() { } -OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException) +OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException, std::exception) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); return m_pAction->GetComment(); } -void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException) +void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); m_pAction->Undo(); } -void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException) +void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index 46247a97be68..542555a7f981 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -69,9 +69,9 @@ public: ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); @@ -97,9 +97,9 @@ public: ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 99762ff14725..09ca819723e5 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -92,7 +92,7 @@ void UndoCommandDispatch::fireStatusEvent( void SAL_CALL UndoCommandDispatch::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xUndoManager.is() ) { @@ -134,7 +134,7 @@ void SAL_CALL UndoCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL UndoCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + 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 971767e905e1..aec5d699ddc3 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -47,7 +47,7 @@ protected: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -56,7 +56,7 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void fireStatusEvent( const OUString & rURL, diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 5ab8eb9042cc..bbe887e4e053 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -95,7 +95,7 @@ protected: // ____ XPropertySet ____ /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); /// @see ::comphelper::OPropertyArrayUsageHelper @@ -103,39 +103,39 @@ protected: // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XNumericalDataSequence ____ /// @see ::com::sun::star::chart::data::XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception); // sal_Int32 m_nNumberFormatKey; diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 0d94e0286676..0cb4e3d5e9c8 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -62,7 +62,7 @@ public: protected: // ____ XColorScheme ____ SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ConfigItemListener ____ SAL_DLLPRIVATE virtual void notify( const OUString & rPropertyName ); diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index a7a27a8bd624..799201427342 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -56,11 +56,11 @@ protected: // ____ XDataSource ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSink ____ virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Sequence< diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index d533c96110fc..d24f1208b69f 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -87,63 +87,63 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); + getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyState virtual com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException); + throw (com::sun::star::beans::UnknownPropertyException, std::exception); virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const com::sun::star::uno::Sequence< OUString >& rPropNames ) - throw (com::sun::star::beans::UnknownPropertyException); + throw (com::sun::star::beans::UnknownPropertyException, std::exception); virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException); + throw (com::sun::star::beans::UnknownPropertyException, std::exception); virtual com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException); + throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, std::exception); protected: ErrorBar( const ErrorBar & rOther ); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSink ____ virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSource ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChild ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index fd47f2e8518b..fc113c7afe53 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -40,11 +40,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -54,7 +54,7 @@ private: const css::uno::Reference& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // formula is: f(x) = 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 2decabba8b05..284a9ba1264e 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -88,133 +88,133 @@ public: // ____ XInternalDataProvider ____ virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getDataByRangeRepresentation( const OUString& aRange ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDataByRangeRepresentation( const OUString& aRange, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aNewData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL appendSequence() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL registerDataSequenceForChanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSeq ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataProvider (base of XInternalDataProvider) ____ virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XRangeXMLConversion ____ virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XDateCategories ____ - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAnyDescriptionAccess ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAnyRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAnyColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual double SAL_CALL getNotANumber() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception); private: void lcl_addDataSequenceToMap( diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 3cd8258b0017..f825d45ae38a 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -67,27 +67,27 @@ public: protected: // ____ XLabeledDataSequence ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xData; diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index 30313ac678cb..6696bcfa0599 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -37,7 +37,7 @@ private: sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -47,7 +47,7 @@ private: const css::uno::Reference& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index 6056b9978a85..a91d6bbc5e65 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -40,11 +40,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -54,7 +54,7 @@ private: const css::uno::Reference& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // 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 7ccfe489e011..5bafcd4254c7 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -40,11 +40,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -54,7 +54,7 @@ private: const css::uno::Reference& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // formula is: f(x) = m_fMeanValue double m_fMeanValue; diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 31d5976140db..72627705a446 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -71,20 +71,20 @@ protected: // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ WeakComponentImplHelperBase ____ virtual void SAL_CALL disposing(); diff --git a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx index d05fa25a831a..5ef6e253129d 100644 --- a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx @@ -41,11 +41,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -55,7 +55,7 @@ private: const css::uno::Reference& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); std::vector aYList; std::vector aXList; diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 44b8a77a0c2a..3a2f748d220e 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -52,28 +52,28 @@ public: virtual ~NameContainer(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Type SAL_CALL getElementType( ) throw( com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Type SAL_CALL getElementType( ) throw( com::sun::star::uno::RuntimeException, std::exception); // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException, std::exception); private: //methods NameContainer();//no default contructor diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 10ac717ac291..33cbb8a61f81 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -129,7 +129,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); /** The same as getFastProperyValue, but return the value through rValue and @@ -156,67 +156,67 @@ protected: // ____ XInterface ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTypeProvider ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XMultiPropertyStates ____ // Note: getPropertyStates() is already implemented in XPropertyState with the // same signature virtual void SAL_CALL setAllPropertiesToDefault() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XStyleSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > SAL_CALL getStyle() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XMultiPropertySet ____ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // ____ XFastPropertySet ____ virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // 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 200463eeee5e..bf05e8a766ca 100644 --- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx @@ -38,14 +38,14 @@ protected: virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -55,7 +55,7 @@ private: const css::uno::Reference& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); std::vector mCoefficients; }; diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 022263289d45..b581ca14556b 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -41,11 +41,11 @@ private: virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -55,7 +55,7 @@ private: const css::uno::Reference& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); // formula is: f(x) = x ^ m_fSlope * m_fIntercept double m_fSlope; diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index 03461969c810..c036fc165211 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -57,23 +57,23 @@ public: protected: // ____ XRangeHighlighter ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ 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 f931a952213b..0128d4c0bc80 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -63,16 +63,16 @@ protected: sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL recalculateRegression( const com::sun::star::uno::Sequence< double >& aXValues, const com::sun::star::uno::Sequence< double >& aYValues ) - throw (com::sun::star::uno::RuntimeException) = 0; + throw (com::sun::star::uno::RuntimeException, std::exception) = 0; virtual double SAL_CALL getCurveValue( double x ) throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException) = 0; + com::sun::star::uno::RuntimeException, std::exception) = 0; virtual com::sun::star::uno::Sequence< com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues( double min, @@ -82,18 +82,18 @@ protected: const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual double SAL_CALL getCorrelationCoefficient() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRepresentation() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getFormattedRepresentation( const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xNumFmtSupplier, sal_Int32 nNumberFormatKey ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 2f94984ea154..3d3d6621c4bc 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -53,15 +53,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const double m_fBase; @@ -93,15 +93,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const double m_fBase; @@ -131,15 +131,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const double m_fSlope; @@ -170,15 +170,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const double m_fExponent; diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index b317e8d99691..a71eab2815eb 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -36,13 +36,13 @@ namespace apphelper #define APPHELPER_XSERVICEINFO_DECL() \ virtual OUString SAL_CALL \ getImplementationName() \ - throw( ::com::sun::star::uno::RuntimeException ); \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ); \ virtual sal_Bool SAL_CALL \ supportsService( const OUString& ServiceName ) \ - throw( ::com::sun::star::uno::RuntimeException ); \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ); \ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL \ getSupportedServiceNames() \ - throw( ::com::sun::star::uno::RuntimeException ); \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ); \ \ static OUString getImplementationName_Static(); \ static ::com::sun::star::uno::Sequence< OUString > \ @@ -54,7 +54,7 @@ namespace apphelper #define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ OUString SAL_CALL Class::getImplementationName() \ - throw( ::com::sun::star::uno::RuntimeException ) \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ { \ return getImplementationName_Static(); \ } \ @@ -66,7 +66,7 @@ OUString Class::getImplementationName_Static() \ \ sal_Bool SAL_CALL \ Class::supportsService( const OUString& ServiceName ) \ - throw( ::com::sun::star::uno::RuntimeException ) \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ { \ ::com::sun::star::uno::Sequence< OUString > aSNL = \ getSupportedServiceNames(); \ @@ -82,7 +82,7 @@ Class::supportsService( const OUString& ServiceName ) \ \ ::com::sun::star::uno::Sequence< OUString > SAL_CALL \ Class::getSupportedServiceNames() \ - throw( ::com::sun::star::uno::RuntimeException ) \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ) \ { \ return getSupportedServiceNames_Static(); \ } diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index c0c850739514..ba95a5d8b59f 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -95,7 +95,7 @@ protected: // ____ XPropertySet ____ /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); /// @see ::comphelper::OPropertyArrayUsageHelper @@ -103,69 +103,69 @@ protected: // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XNumericalDataSequence ____ /// @see ::com::sun::star::chart::data::XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XIndexReplace ____ virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XIndexAccess (base of XIndexReplace) ____ virtual ::sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XElementAccess (base of XIndexAccess) ____ virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XNamed (for setting a new range representation) ____ virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifiable ____ virtual ::sal_Bool SAL_CALL isModified() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster (base of XModifiable) ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); void fireModifyEvent(); diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index 39eb088737ad..f2195acf7f1c 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -90,7 +90,7 @@ public: protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; class WeakSelectionChangeListenerAdapter : @@ -105,7 +105,7 @@ protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 5ad89e8d7c08..6252974efec1 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -57,35 +57,35 @@ public: public: //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); 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 0cd5a3cfc842..d4f582e7657f 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -215,7 +215,7 @@ XMLFilter::~XMLFilter() // ____ XFilter ____ sal_Bool SAL_CALL XMLFilter::filter( const Sequence< beans::PropertyValue >& aDescriptor ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -254,7 +254,7 @@ sal_Bool SAL_CALL XMLFilter::filter( } void SAL_CALL XMLFilter::cancel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // if mutex is locked set "cancel state" // note: is currently ignored in filter-method @@ -268,7 +268,7 @@ void SAL_CALL XMLFilter::cancel() void SAL_CALL XMLFilter::setTargetDocument( const Reference< lang::XComponent >& Document ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); OSL_ENSURE( ! m_xSourceDoc.is(), "Setting target doc while source doc is set" ); @@ -280,7 +280,7 @@ void SAL_CALL XMLFilter::setTargetDocument( void SAL_CALL XMLFilter::setSourceDocument( const Reference< lang::XComponent >& Document ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); OSL_ENSURE( ! m_xTargetDoc.is(), "Setting source doc while target doc is set" ); diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index 1a155bf6f3b7..bcdcf76540c5 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -72,7 +72,7 @@ public: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// merge XInterface implementations DECLARE_XINTERFACE() @@ -82,54 +82,54 @@ public: protected: // ____ XCoordinateSystem ____ virtual ::sal_Int32 SAL_CALL getDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setAxisByDimension( ::sal_Int32 nDimension, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > SAL_CALL getAxisByDimension( ::sal_Int32 nDimension, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeContainer ____ virtual void SAL_CALL addChartType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& aChartType ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChartType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& aChartType ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > SAL_CALL getChartTypes() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setChartTypes( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aChartTypes ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index ca8f86919fba..e8c243053ac4 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -38,14 +38,14 @@ public: // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getViewServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index c8cd279e31d1..2fd9541c5a9a 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -52,17 +52,17 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeManager ____ // currently empty diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 27a5ad24e81a..a4a2d4b69d82 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -94,21 +94,21 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetAllDataPoints() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSink ____ /// @see ::com::sun::star::chart2::data::XDataSink virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSource ____ /// @see ::com::sun::star::chart2::data::XDataSource virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -117,7 +117,7 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); @@ -125,7 +125,7 @@ protected: /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -136,43 +136,43 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve >& aRegressionCurve ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeRegressionCurve( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve >& aRegressionCurve ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setRegressionCurves( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > >& aRegressionCurves ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 4a436379e4e2..4c9ade06606d 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -91,11 +91,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XFastPropertySet ____ virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -106,82 +106,82 @@ protected: // ____ XDiagram ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getWall() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getFloor() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend > SAL_CALL getLegend() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend >& xLegend ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDefaultColorScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme >& xColorScheme ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDiagramData( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCoordinateSystemContainer ____ virtual void SAL_CALL addCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& aCoordSys ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& aCoordSys ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setCoordinateSystems( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > >& aCoordinateSystems ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index 3a498214ee53..ac6685b6ff09 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -38,14 +38,14 @@ public: // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getViewServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index d63a6120fb93..6652311f3701 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -68,29 +68,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 648e25f45f5c..b106c7d764e6 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -73,23 +73,23 @@ protected: virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL cancel() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XExporter ____ virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); inline OUString getDocumentHandler() const { return m_sDocumentHandler; } inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } @@ -180,7 +180,7 @@ public: protected: virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -189,7 +189,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { setDocumentHandler( "com.sun.star.comp.report.ImportDocumentHandler" ); XMLFilter::setTargetDocument(Document); @@ -200,7 +200,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { 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 a94a7d750f38..fdc2798c25bd 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -438,7 +438,7 @@ void Axis::AllocateSubGrids() // ____ XAxis ____ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; Reference< lang::XEventListener > xEventListener; @@ -468,27 +468,27 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) } chart2::ScaleData SAL_CALL Axis::getScaleData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_aScaleData; } Reference< beans::XPropertySet > SAL_CALL Axis::getGridProperties() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_xGrid; } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_aSubGridProperties; } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented yet" ); return Sequence< Reference< beans::XPropertySet > >(); @@ -496,14 +496,14 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties // ____ XTitled ____ Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_xTitle; } void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; Reference< chart2::XTitle > xOldTitle; @@ -524,7 +524,7 @@ void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Axis::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Axis * pNewAxis( new Axis( *this )); // hold a reference to the clone @@ -536,7 +536,7 @@ Reference< util::XCloneable > SAL_CALL Axis::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -550,7 +550,7 @@ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >& } void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -565,14 +565,14 @@ void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener // ____ XModifyListener ____ void SAL_CALL Axis::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { if( Source.Source == m_aScaleData.Categories ) m_aScaleData.Categories = 0; @@ -607,7 +607,7 @@ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticAxisInfo::get(); } diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 7fb1d2881e62..d99e1f80acc1 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -85,56 +85,56 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XAxis ____ virtual void SAL_CALL setScaleData( const ::com::sun::star::chart2::ScaleData& rScaleData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::ScaleData SAL_CALL getScaleData() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getGridProperties() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > SAL_CALL getSubGridProperties() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > SAL_CALL getSubTickProperties() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ // Note: the coordinate systems are not cloned! virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index f9a5b1f1cd15..bd4ea1233266 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -200,7 +200,7 @@ BaseCoordinateSystem::~BaseCoordinateSystem() // ____ XCoordinateSystem ____ sal_Int32 SAL_CALL BaseCoordinateSystem::getDimension() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_nDimensionCount; } @@ -210,7 +210,7 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension( const Reference< chart2::XAxis >& xAxis, sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -236,7 +236,7 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension( Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -251,7 +251,7 @@ Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -268,7 +268,7 @@ sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int // ____ XChartTypeContainer ____ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChartType >& aChartType ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ) != m_aChartTypes.end()) @@ -281,7 +281,7 @@ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChar void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XChartType >& aChartType ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::std::vector< uno::Reference< chart2::XChartType > >::iterator aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )); @@ -296,14 +296,14 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC } Sequence< Reference< chart2::XChartType > > SAL_CALL BaseCoordinateSystem::getChartTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ContainerHelper::ContainerToSequence( m_aChartTypes ); } void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< chart2::XChartType > >& aChartTypes ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ModifyListenerHelper::removeListenerFromAllElements( m_aChartTypes, m_xModifyEventForwarder ); m_aChartTypes = ContainerHelper::SequenceToVector( aChartTypes ); @@ -313,7 +313,7 @@ void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< ch // ____ XModifyBroadcaster ____ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -327,7 +327,7 @@ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XM } void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -342,14 +342,14 @@ void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util: // ____ XModifyListener ____ void SAL_CALL BaseCoordinateSystem::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -384,7 +384,7 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL BaseCoordinateSystem::getPropertySetInfo() - throw (uno::RuntimeException) + 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 3fa8e294a299..b594f6c50912 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -58,20 +58,20 @@ CartesianCoordinateSystem::~CartesianCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL CartesianCoordinateSystem::getCoordinateSystemType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME; } OUString SAL_CALL CartesianCoordinateSystem::getViewServiceName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME; } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClone() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return Reference< util::XCloneable >( new CartesianCoordinateSystem( *this )); } diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 0fab4a6d3215..9e5aaaba8b27 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -197,7 +197,7 @@ ChartModel::~ChartModel() } void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { //#i113722# avoid duplicate creation @@ -328,7 +328,7 @@ uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static() sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL , const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { /* The method attachResource() is used by the frame loader implementations @@ -352,12 +352,12 @@ sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL return sal_True; } -OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException) +OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException, std::exception) { return impl_g_getLocation(); } -uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno::RuntimeException) +uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno::RuntimeException, std::exception) { /* The method getArgs() returns a sequence of property values @@ -374,7 +374,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno:: } void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XController >& xController ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo? this method is declared as oneway -> ...? @@ -388,7 +388,7 @@ void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XContr } void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XController >& xController ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo? this method is declared as oneway -> ...? @@ -406,7 +406,7 @@ void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XCo DisposeHelper::DisposeAndClear( m_xRangeHighlighter ); } -void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException) +void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException, std::exception) { /* suspends some notifications to the controllers which are used for display updates. @@ -424,7 +424,7 @@ void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException) ++m_nControllerLockCount; } -void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException) +void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std::exception) { /* resumes the notifications which were suspended by lockControllers() . @@ -452,7 +452,7 @@ void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException) } } -sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException) +sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -460,7 +460,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) +uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() throw(uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -472,7 +472,7 @@ uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() } void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XController >& xController ) - throw(container::NoSuchElementException, uno::RuntimeException) + throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -491,7 +491,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) +uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() throw(uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -518,7 +518,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr } // lang::XComponent (base of XModel) -void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException) +void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception) { Reference< XInterface > xKeepAlive( *this ); @@ -570,7 +570,7 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException) } void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -579,7 +579,7 @@ void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventLi } void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -590,13 +590,13 @@ 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) + throw(uno::RuntimeException, std::exception) { m_aLifeTimeManager.g_addCloseListener( xListener ); } void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XCloseListener > & xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -608,7 +608,7 @@ 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 ) + uno::RuntimeException, std::exception ) { //hold no mutex @@ -661,7 +661,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) // lang::XTypeProvider uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XTypeProvider > xAggTypeProvider; if( (m_xOldModelAgg->queryAggregation( ::getCppuType( & xAggTypeProvider )) >>= xAggTypeProvider) @@ -683,7 +683,7 @@ uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() // document::XDocumentPropertiesSupplier uno::Reference< document::XDocumentProperties > SAL_CALL - ChartModel::getDocumentProperties() throw (uno::RuntimeException) + ChartModel::getDocumentProperties() throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aModelMutex ); if ( !m_xDocumentProperties.is() ) @@ -694,7 +694,7 @@ uno::Reference< document::XDocumentProperties > SAL_CALL } // document::XDocumentPropertiesSupplier -Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) throw (RuntimeException) +Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aModelMutex ); if ( !m_pUndoManager.is() ) @@ -705,14 +705,14 @@ Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) thro // chart2::XChartDocument uno::Reference< chart2::XDiagram > SAL_CALL ChartModel::getFirstDiagram() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XDiagram > xOldDiagram; Reference< util::XModifyListener > xListener; @@ -772,7 +772,7 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() } void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingData ) - throw (util::CloseVetoException, uno::RuntimeException) + 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 @@ -790,13 +790,13 @@ void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingDat } sal_Bool SAL_CALL ChartModel::hasInternalDataProvider() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_xDataProvider.is() && m_xInternalDataProvider.is(); } uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvider() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xDataProvider; @@ -805,7 +805,7 @@ 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) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -831,7 +831,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data } void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& xNewSupplier ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -862,7 +862,7 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& aArguments ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -900,19 +900,19 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& } Sequence< OUString > SAL_CALL ChartModel::getUsedRangeRepresentations() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return DataSourceHelper::getUsedDataRanges( Reference< frame::XModel >(this)); } Reference< chart2::data::XDataSource > SAL_CALL ChartModel::getUsedData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return DataSourceHelper::getUsedData( Reference< chart2::XChartDocument >(this)); } Reference< chart2::data::XRangeHighlighter > SAL_CALL ChartModel::getRangeHighlighter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xRangeHighlighter.is()) { @@ -933,7 +933,7 @@ Reference< chart2::XChartTypeTemplate > ChartModel::impl_createDefaultChartTypeT } void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XChartTypeManager >& xNewManager ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -943,14 +943,14 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh } uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xChartTypeManager; } uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xPageBackground; @@ -958,14 +958,14 @@ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground() // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -979,7 +979,7 @@ 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) + throw (uno::RuntimeException, std::exception) { uno::Any aResult( impl::ChartModel_Base::queryInterface( aType )); @@ -1002,7 +1002,7 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType ) // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL ChartModel::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new ChartModel( *this )); } @@ -1012,7 +1012,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( nAspect == embed::Aspects::MSOLE_CONTENT ) { @@ -1041,7 +1041,7 @@ awt::Size SAL_CALL ChartModel::getVisualAreaSize( ::sal_Int64 nAspect ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1055,7 +1055,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1095,7 +1095,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio ::sal_Int32 SAL_CALL ChartModel::getMapUnit( ::sal_Int64 nAspect ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1107,7 +1107,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& aFlavor ) throw (datatransfer::UnsupportedFlavorException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Any aResult; if( this->isDataFlavorSupported( aFlavor )) @@ -1138,7 +1138,7 @@ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& a } Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aRet(1); @@ -1150,7 +1150,7 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors } ::sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast); } @@ -1188,7 +1188,7 @@ tServiceNameMap & lcl_getStaticServiceNameMap() } // ____ XMultiServiceFactory ____ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString& rServiceSpecifier ) - throw( uno::Exception, uno::RuntimeException ) + throw( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > xResult; tServiceNameMap & rMap = lcl_getStaticServiceNameMap(); @@ -1244,7 +1244,7 @@ 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 ) + throw( uno::Exception, uno::RuntimeException, std::exception ) { OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" ); (void)(Arguments); // avoid warning in non-debug builds @@ -1252,7 +1252,7 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments( } Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aResult; @@ -1285,7 +1285,7 @@ Reference< util::XNumberFormatsSupplier > ChartModel::getNumberFormatsSupplier() // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartModel::getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { if( aIdentifier.getLength() == 16 && 0 == memcmp( SvNumberFormatsSupplierObj::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) @@ -1299,7 +1299,7 @@ Reference< util::XNumberFormatsSupplier > ChartModel::getNumberFormatsSupplier() // ____ XNumberFormatsSupplier ____ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettings() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() ); if( xSupplier.is() ) @@ -1308,7 +1308,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettin } uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() ); if( xSupplier.is() ) @@ -1318,14 +1318,14 @@ uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats() // ____ XChild ____ Reference< uno::XInterface > SAL_CALL ChartModel::getParent() - throw (uno::RuntimeException) + 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) + uno::RuntimeException, std::exception) { if( Parent != m_xParent ) m_xParent.set( Parent, uno::UNO_QUERY ); @@ -1333,7 +1333,7 @@ void SAL_CALL ChartModel::setParent( const Reference< uno::XInterface >& Parent // ____ XDataSource ____ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartModel::getDataSequences() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::data::XDataSource > xSource( DataSourceHelper::getUsedData( uno::Reference< frame::XModel >(this) ) ); @@ -1345,7 +1345,7 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM //XDumper OUString SAL_CALL ChartModel::dump() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< qa::XDumper > xDumper( this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 22e78a15f85a..4ab08f617fee 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -201,7 +201,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMediaDescriptor ) throw (lang::IllegalArgumentException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { // only some parameters are allowed (see also SfxBaseModel) // "VersionComment", "Author", "InteractionHandler", "StatusIndicator" @@ -212,20 +212,20 @@ void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMe // frame::XStorable (base of XStorable2) sal_Bool SAL_CALL ChartModel::hasLocation() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo guard return !m_aResource.isEmpty(); } OUString SAL_CALL ChartModel::getLocation() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return impl_g_getLocation(); } sal_Bool SAL_CALL ChartModel::isReadonly() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo guard return m_bReadOnly; @@ -233,7 +233,7 @@ sal_Bool SAL_CALL ChartModel::isReadonly() void SAL_CALL ChartModel::store() throw(io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(sal_True)) //start LongLastingCall @@ -256,7 +256,7 @@ void SAL_CALL ChartModel::store() void SAL_CALL ChartModel::storeAsURL( const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(io::IOException, uno::RuntimeException) + throw(io::IOException, uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(sal_True)) //start LongLastingCall @@ -283,7 +283,7 @@ void SAL_CALL ChartModel::storeToURL( const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) throw(io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(sal_True)) //start LongLastingCall @@ -386,7 +386,7 @@ void SAL_CALL ChartModel::initNew() throw (frame::DoubleInitializationException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { lockControllers(); createInternalDataProvider( sal_False ); @@ -492,7 +492,7 @@ void SAL_CALL ChartModel::load( throw (frame::DoubleInitializationException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< embed::XStorage > xStorage; OUString aURL; @@ -677,7 +677,7 @@ void SAL_CALL ChartModel::impl_notifyModifiedListeners() } sal_Bool SAL_CALL ChartModel::isModified() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { //@todo guard return m_bModified; @@ -685,7 +685,7 @@ sal_Bool SAL_CALL ChartModel::isModified() void SAL_CALL ChartModel::setModified( sal_Bool bModified ) throw(beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall())//@todo ? is this a long lasting call?? @@ -706,7 +706,7 @@ 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) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -717,7 +717,7 @@ void SAL_CALL ChartModel::addModifyListener( void SAL_CALL ChartModel::removeModifyListener( const uno::Reference< util::XModifyListener >& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -728,7 +728,7 @@ void SAL_CALL ChartModel::removeModifyListener( // util::XModifyListener void SAL_CALL ChartModel::modified( const lang::EventObject& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_nInLoad == 0 ) setModified( sal_True ); @@ -736,7 +736,7 @@ 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) + throw (uno::RuntimeException, std::exception) { // child was disposed -- should not happen from outside } @@ -749,7 +749,7 @@ void SAL_CALL ChartModel::loadFromStorage( frame::DoubleInitializationException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { attachResource( OUString(), rMediaDescriptor ); impl_load( rMediaDescriptor, xStorage ); @@ -761,7 +761,7 @@ void SAL_CALL ChartModel::storeToStorage( throw (lang::IllegalArgumentException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { impl_store( rMediaDescriptor, xStorage ); } @@ -770,7 +770,7 @@ void SAL_CALL ChartModel::switchToStorage( const Reference< embed::XStorage >& x throw (lang::IllegalArgumentException, io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_xStorage = xStorage; impl_notifyStorageChangeListeners(); @@ -779,7 +779,7 @@ void SAL_CALL ChartModel::switchToStorage( const Reference< embed::XStorage >& x Reference< embed::XStorage > SAL_CALL ChartModel::getDocumentStorage() throw (io::IOException, uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return m_xStorage; } @@ -802,7 +802,7 @@ void SAL_CALL ChartModel::impl_notifyStorageChangeListeners() } void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -812,7 +812,7 @@ void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::X } void SAL_CALL ChartModel::removeStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - throw (uno::RuntimeException) + 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 5a2f6c5d8344..dd0c6d880ae1 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -151,14 +151,14 @@ DataPoint::~DataPoint() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL DataPoint::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new DataPoint( *this )); } // ____ XChild ____ Reference< uno::XInterface > SAL_CALL DataPoint::getParent() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< uno::XInterface >( m_xParentProperties.get(), uno::UNO_QUERY ); } @@ -166,7 +166,7 @@ Reference< uno::XInterface > SAL_CALL DataPoint::getParent() void SAL_CALL DataPoint::setParent( const Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_xParentProperties = Reference< beans::XPropertySet >( Parent, uno::UNO_QUERY ); } @@ -188,7 +188,7 @@ uno::Any DataPoint::GetDefaultValue( sal_Int32 nHandle ) const void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception) + throw (uno::Exception, std::exception) { if( nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X ) @@ -222,14 +222,14 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL DataPoint::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticDataPointInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -243,7 +243,7 @@ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyL } void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -258,14 +258,14 @@ void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL DataPoint::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL DataPoint::disposing( const lang::EventObject& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index e339bd948624..45658afb317e 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -71,43 +71,43 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ // Note: m_xParentProperties are not cloned! virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChild ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 58c4b2e75361..d9370111658a 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -249,7 +249,7 @@ DataSeries::~DataSeries() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { DataSeries * pNewSeries( new DataSeries( *this )); // hold a reference to the clone @@ -288,7 +288,7 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL DataSeries::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticDataSeriesInfo::get(); } @@ -320,7 +320,7 @@ void SAL_CALL DataSeries::getFastPropertyValue void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception) + throw (uno::Exception, std::exception) { if( nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X ) @@ -350,7 +350,7 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( Reference< beans::XPropertySet > SAL_CALL DataSeries::getDataPointByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xResult; @@ -402,7 +402,7 @@ Reference< beans::XPropertySet > } void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xDataPointProp; Reference< util::XModifyListener > xModifyEventForwarder; @@ -427,7 +427,7 @@ void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex ) } void SAL_CALL DataSeries::resetAllDataPoints() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tDataPointAttributeContainer aOldAttributedDataPoints; Reference< util::XModifyListener > xModifyEventForwarder; @@ -443,7 +443,7 @@ void SAL_CALL DataSeries::resetAllDataPoints() // ____ XDataSink ____ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tDataSequenceContainer aOldDataSequences; tDataSequenceContainer aNewDataSequences; @@ -466,7 +466,7 @@ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data: // ____ XDataSource ____ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries::getDataSequences() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return ContainerHelper::ContainerToSequence( m_aDataSequences ); @@ -476,7 +476,7 @@ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries: void SAL_CALL DataSeries::addRegressionCurve( const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; { @@ -494,7 +494,7 @@ void SAL_CALL DataSeries::addRegressionCurve( void SAL_CALL DataSeries::removeRegressionCurve( const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( !xRegressionCurve.is() ) throw container::NoSuchElementException(); @@ -517,7 +517,7 @@ void SAL_CALL DataSeries::removeRegressionCurve( } uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries::getRegressionCurves() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return ContainerHelper::ContainerToSequence( m_aRegressionCurves ); @@ -525,7 +525,7 @@ uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries: void SAL_CALL DataSeries::setRegressionCurves( const Sequence< Reference< chart2::XRegressionCurve > >& aRegressionCurves ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { tRegressionCurveContainerType aOldCurves; tRegressionCurveContainerType aNewCurves( ContainerHelper::SequenceToVector( aRegressionCurves ) ); @@ -543,7 +543,7 @@ void SAL_CALL DataSeries::setRegressionCurves( // ____ XModifyBroadcaster ____ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -557,7 +557,7 @@ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListe } void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -572,14 +572,14 @@ void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyLi // ____ XModifyListener ____ void SAL_CALL DataSeries::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // forget disposed data sequences tDataSequenceContainer::iterator aIt( diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index 9de30d9b118d..6b80d367df55 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -362,7 +362,7 @@ Diagram::~Diagram() // ____ XDiagram ____ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xRet; bool bAddListener = false; @@ -381,7 +381,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall() } uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xRet; bool bAddListener = false; @@ -400,14 +400,14 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor() } uno::Reference< chart2::XLegend > SAL_CALL Diagram::getLegend() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XLegend > xOldLegend; { @@ -425,7 +425,7 @@ void SAL_CALL Diagram::setLegend( const uno::Reference< chart2::XLegend >& xNewL } Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XColorScheme > xRet; { @@ -443,7 +443,7 @@ Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme() } void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorScheme >& xColorScheme ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -455,7 +455,7 @@ 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) + 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 +470,14 @@ void SAL_CALL Diagram::setDiagramData( // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XTitle > xOldTitle; { @@ -496,19 +496,19 @@ void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& x // ____ X3DDefaultSetter ____ void SAL_CALL Diagram::set3DSettingsToDefault() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThreeDHelper::set3DSettingsToDefault( this ); } void SAL_CALL Diagram::setDefaultRotation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThreeDHelper::setDefaultRotation( this ); } void SAL_CALL Diagram::setDefaultIllumination() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ThreeDHelper::setDefaultIllumination( this ); } @@ -517,7 +517,7 @@ void SAL_CALL Diagram::setDefaultIllumination() void SAL_CALL Diagram::addCoordinateSystem( const uno::Reference< chart2::XCoordinateSystem >& aCoordSys ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -539,7 +539,7 @@ void SAL_CALL Diagram::addCoordinateSystem( void SAL_CALL Diagram::removeCoordinateSystem( const uno::Reference< chart2::XCoordinateSystem >& aCoordSys ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -556,7 +556,7 @@ void SAL_CALL Diagram::removeCoordinateSystem( } uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::getCoordinateSystems() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return ContainerHelper::ContainerToSequence( m_aCoordSystems ); @@ -565,7 +565,7 @@ 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) + uno::RuntimeException, std::exception) { tCoordinateSystemContainerType aNew; tCoordinateSystemContainerType aOld; @@ -586,7 +586,7 @@ void SAL_CALL Diagram::setCoordinateSystems( // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Diagram::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return Reference< util::XCloneable >( new Diagram( *this )); @@ -594,7 +594,7 @@ Reference< util::XCloneable > SAL_CALL Diagram::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -608,7 +608,7 @@ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener } void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -623,14 +623,14 @@ void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListe // ____ XModifyListener ____ void SAL_CALL Diagram::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -675,7 +675,7 @@ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Diagram::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticDiagramInfo::get(); } @@ -685,7 +685,7 @@ void SAL_CALL Diagram::setFastPropertyValue( sal_Int32 nHandle, const Any& rValu throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { //special treatment for some 3D properties if( PROP_DIAGRAM_PERSPECTIVE == nHandle ) diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 95e4fb159128..95b709fc9d1d 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -120,21 +120,21 @@ FormattedString::~FormattedString() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new FormattedString( *this )); } // ____ XFormattedString ____ OUString SAL_CALL FormattedString::getString() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex()); return m_aString; } void SAL_CALL FormattedString::setString( const OUString& String ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex()); @@ -147,7 +147,7 @@ void SAL_CALL FormattedString::setString( const OUString& String ) // ____ XModifyBroadcaster ____ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -161,7 +161,7 @@ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XM } void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -176,14 +176,14 @@ void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util: // ____ XModifyListener ____ void SAL_CALL FormattedString::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -227,7 +227,7 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL FormattedString::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticFormattedStringInfo::get(); } diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 28f0e9c555f6..f06b89d3e259 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -64,17 +64,17 @@ public: /// 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) + 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) { ::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) + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { 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) + 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) { ::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) + 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) { ::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) + 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) { ::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) + 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) { ::property::OPropertySet::removeVetoableChangeListener(p1, p2); } protected: @@ -82,9 +82,9 @@ protected: // ____ XFormattedString ____ virtual OUString SAL_CALL getString() - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); virtual void SAL_CALL setString( const OUString& String ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -96,29 +96,29 @@ protected: // ____ XPropertySet ____ virtual ::css::uno::Reference< ::css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::css::uno::Reference< ::css::util::XCloneable > SAL_CALL createClone() - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::css::uno::Reference< ::css::util::XModifyListener >& aListener ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::css::uno::Reference< ::css::util::XModifyListener >& aListener ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::css::lang::EventObject& aEvent ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::css::lang::EventObject& Source ) - throw (::css::uno::RuntimeException); + throw (::css::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index e73fec7528c7..f7a282440651 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -168,21 +168,21 @@ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL GridProperties::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticGridInfo::get(); } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL GridProperties::createClone() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { try { @@ -196,7 +196,7 @@ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyL } void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -211,14 +211,14 @@ void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL GridProperties::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index ce7daf0b0f39..73b3a0012ddd 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -80,29 +80,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index c1d5cd1c935c..01f5a1178285 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -203,14 +203,14 @@ Legend::~Legend() // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Legend::createClone() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { try { @@ -224,7 +224,7 @@ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener } void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -239,14 +239,14 @@ void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListen // ____ XModifyListener ____ void SAL_CALL Legend::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -295,7 +295,7 @@ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticLegendInfo::get(); } diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 9ceaae492ec4..22712c9ce285 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -80,29 +80,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 9f00dbbbebd0..3b72c388d67a 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -132,7 +132,7 @@ PageBackground::~PageBackground() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PageBackground::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PageBackground( *this )); } @@ -155,14 +155,14 @@ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PageBackground::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticPageBackgroundInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -176,7 +176,7 @@ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XMo } void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -191,14 +191,14 @@ void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util:: // ____ XModifyListener ____ void SAL_CALL PageBackground::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index c80af5b901f6..7070037b7f71 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -73,29 +73,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 326afb3c18c7..ad11512aa343 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -58,20 +58,20 @@ PolarCoordinateSystem::~PolarCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CHART2_COOSYSTEM_POLAR_SERVICE_NAME; } OUString SAL_CALL PolarCoordinateSystem::getViewServiceName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME; } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return Reference< util::XCloneable >( new PolarCoordinateSystem( *this )); } diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 64bad2adecca..4c2044b6b8f4 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -142,7 +142,7 @@ StockBar::~StockBar() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL StockBar::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new StockBar( *this )); } @@ -165,14 +165,14 @@ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL StockBar::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticStockBarInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -186,7 +186,7 @@ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyLi } void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -201,14 +201,14 @@ void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModif // ____ XModifyListener ____ void SAL_CALL StockBar::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 831c81cf293e..2e6b1b21091a 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -256,21 +256,21 @@ Title::~Title() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL Title::createClone() - throw (uno::RuntimeException) + 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) + 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) + throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Reference< chart2::XFormattedString > > aOldStrings; { @@ -304,14 +304,14 @@ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Title::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticTitleInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -325,7 +325,7 @@ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListe } void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -340,14 +340,14 @@ void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyLi // ____ XModifyListener ____ void SAL_CALL Title::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 6c60490eeada..84d12923ec24 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -78,39 +78,39 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitle ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& Strings ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 8228be0aaa63..5916befacbdc 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -214,31 +214,31 @@ namespace chart m_pImpl->disposing(); } - void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException) + void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard ); } - void SAL_CALL UndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException) + void SAL_CALL UndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterHiddenUndoContext( aGuard ); } - void SAL_CALL UndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException) + void SAL_CALL UndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().leaveUndoContext( aGuard ); } - void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException) + void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoAction( i_action, aGuard ); } - void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) + void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().undo( aGuard ); @@ -246,7 +246,7 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException) + void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().redo( aGuard ); @@ -254,110 +254,110 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - ::sal_Bool SAL_CALL UndoManager::isUndoPossible( ) throw (RuntimeException) + ::sal_Bool SAL_CALL UndoManager::isUndoPossible( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isUndoPossible(); } - ::sal_Bool SAL_CALL UndoManager::isRedoPossible( ) throw (RuntimeException) + ::sal_Bool SAL_CALL UndoManager::isRedoPossible( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isRedoPossible(); } - OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentUndoActionTitle(); } - OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException) + OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentRedoActionTitle(); } - Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllUndoActionTitles(); } - Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllRedoActionTitles(); } - void SAL_CALL UndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException) + void SAL_CALL UndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clear( aGuard ); } - void SAL_CALL UndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException) + void SAL_CALL UndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clearRedo( aGuard ); } - void SAL_CALL UndoManager::reset( ) throw (RuntimeException) + void SAL_CALL UndoManager::reset( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().reset( aGuard ); } - void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException) + void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().removeUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::lock( ) throw (RuntimeException) + void SAL_CALL UndoManager::lock( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().lock(); } - void SAL_CALL UndoManager::unlock( ) throw (NotLockedException, RuntimeException) + void SAL_CALL UndoManager::unlock( ) throw (NotLockedException, RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().unlock(); } - ::sal_Bool SAL_CALL UndoManager::isLocked( ) throw (RuntimeException) + ::sal_Bool SAL_CALL UndoManager::isLocked( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isLocked(); } - Reference< XInterface > SAL_CALL UndoManager::getParent( ) throw (RuntimeException) + Reference< XInterface > SAL_CALL UndoManager::getParent( ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); return *&m_pImpl->getParent(); } - void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException) + void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException, std::exception) { 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) + void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException, std::exception) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addModifyListener( i_listener ); } - void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException) + void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException, std::exception) { 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 863892120ff4..eb390e8e1b15 100644 --- a/chart2/source/model/main/UndoManager.hxx +++ b/chart2/source/model/main/UndoManager.hxx @@ -54,36 +54,36 @@ namespace chart void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XLockable (base of XUndoManager) - virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XChild (base of XUndoManager) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::boost::scoped_ptr< impl::UndoManager_Impl > m_pImpl; diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index 343ac5b2267e..9b76ea85a3e4 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -135,7 +135,7 @@ Wall::~Wall() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL Wall::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new Wall( *this )); } @@ -158,14 +158,14 @@ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Wall::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticWallInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -179,7 +179,7 @@ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListen } void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -194,14 +194,14 @@ void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyLis // ____ XModifyListener ____ void SAL_CALL Wall::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index 82d074689114..a0cd1c02f088 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -71,29 +71,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual void firePropertyChangeEvent(); diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index ef0b11485072..c739d1c3f351 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -40,14 +40,14 @@ AreaChartType::~AreaChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new AreaChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL AreaChartType::getChartType() - throw (uno::RuntimeException) + throw (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 bf95d0a8f068..d8f1b30358a3 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -43,11 +43,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 5a2a7d936b43..1b453e15b4a1 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -156,7 +156,7 @@ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL AreaChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticAreaChartTypeTemplateInfo::get(); } @@ -189,14 +189,14 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( @@ -237,7 +237,7 @@ Reference< chart2::XChartType > AreaChartTypeTemplate::getChartTypeForIndex( sal Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index f278f4637f9f..bbcdcc6fb1f8 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -60,23 +60,23 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 3193cf60b35a..2645c6c412c3 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -41,14 +41,14 @@ BarChartType::~BarChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new BarChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL BarChartType::getChartType() - throw (uno::RuntimeException) + throw (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 a6ff4c3c0c61..e04e882aec9d 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -43,11 +43,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 29de7c7def07..8f10e3757e78 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -166,7 +166,7 @@ bool BarChartTypeTemplate::isSwapXAndY() const sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -221,7 +221,7 @@ Reference< chart2::XChartType > BarChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); @@ -246,7 +246,7 @@ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL BarChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticBarChartTypeTemplateInfo::get(); } @@ -256,7 +256,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); @@ -278,7 +278,7 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( void SAL_CALL BarChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + 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 678faa931502..f5b0bf5da44b 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -67,28 +67,28 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index dc8302aa6de1..1b68d5b9fa4e 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -118,7 +118,7 @@ BubbleChartType::~BubbleChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new BubbleChartType( *this )); } @@ -127,7 +127,7 @@ uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone() Reference< chart2::XCoordinateSystem > SAL_CALL BubbleChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( @@ -158,13 +158,13 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } OUString SAL_CALL BubbleChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE; } uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aMandRolesSeq(4); aMandRolesSeq.realloc( 4 ); @@ -176,7 +176,7 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() } OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("values-size"); } @@ -200,7 +200,7 @@ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticBubbleChartTypeInfo::get(); } diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index 71e3fd80fcdd..03de9dbd8c72 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -44,16 +44,16 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -65,11 +65,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 478a3fd50169..d2c907d02ff2 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -138,7 +138,7 @@ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticBubbleChartTypeTemplateInfo::get(); } @@ -158,7 +158,7 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); @@ -166,7 +166,7 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( // ____ XChartTypeTemplate ____ sal_Bool SAL_CALL BubbleChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return false; } @@ -192,7 +192,7 @@ Reference< chart2::XChartType > BubbleChartTypeTemplate::getChartTypeForIndex( s Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -214,7 +214,7 @@ Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeFo } Reference< chart2::XDataInterpreter > SAL_CALL BubbleChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new BubbleDataInterpreter( GetComponentContext()) ); diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index b7f4b4994eb6..e216802bd147 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -56,24 +56,24 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 353f59e73735..e6756a57dc6b 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -52,7 +52,7 @@ 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) + throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -161,7 +161,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -272,7 +272,7 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 i=0; i& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index c0aa4507b30c..57320b90e3e6 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -208,20 +208,20 @@ CandleStickChartType::~CandleStickChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new CandleStickChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL CandleStickChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK; } uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bShowFirst = true; bool bShowHiLow = false; @@ -246,7 +246,7 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo } Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { bool bShowFirst = true; bool bShowHiLow = false; @@ -268,7 +268,7 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() } OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("values-last"); } @@ -292,14 +292,14 @@ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL CandleStickChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticCandleStickChartTypeInfo::get(); } void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception) + throw (uno::Exception, std::exception) { if( nHandle == PROP_CANDLESTICKCHARTTYPE_WHITE_DAY || nHandle == PROP_CANDLESTICKCHARTTYPE_BLACK_DAY ) diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index dca61c57f8b4..c24291023a57 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -43,15 +43,15 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -64,16 +64,16 @@ protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 65eeff0ddadb..fa652c892677 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -75,7 +75,7 @@ Reference< uno::XComponentContext > ChartType::GetComponentContext() const Reference< chart2::XCoordinateSystem > SAL_CALL ChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( @@ -108,7 +108,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< OUString > aDefaultSeq(2); aDefaultSeq[0] = "label"; @@ -117,13 +117,13 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() } Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Sequence< OUString >(); } OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return OUString("values-y"); } @@ -142,7 +142,7 @@ void ChartType::impl_addDataSeriesWithoutNotification( // ____ XDataSeriesContainer ____ void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >& xDataSeries ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { impl_addDataSeriesWithoutNotification( xDataSeries ); fireModifyEvent(); @@ -150,7 +150,7 @@ void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >& void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries >& xDataSeries ) throw (container::NoSuchElementException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( !xDataSeries.is()) throw container::NoSuchElementException(); @@ -169,14 +169,14 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries } Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartType::getDataSeries() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ContainerHelper::ContainerToSequence( m_aDataSeries ); } void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XDataSeries > >& aDataSeries ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_bNotifyChanges = false; try @@ -247,14 +247,14 @@ struct StaticChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans: // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticChartTypeInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -268,7 +268,7 @@ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyL } void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -283,14 +283,14 @@ void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL ChartType::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 5dd4311761d2..f450aa3c3052 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -67,53 +67,53 @@ protected: // ____ XChartType ____ // still abstract ! implement ! virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException) = 0; + throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XDataSeriesContainer ____ virtual void SAL_CALL addDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& aDataSeries ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& aDataSeries ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > SAL_CALL getDataSeries() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setDataSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aDataSeries ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); void fireModifyEvent(); @@ -128,7 +128,7 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index c945e588b775..e68744cb3474 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -233,7 +233,7 @@ ChartTypeManager::~ChartTypeManager() uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( const OUString& aServiceSpecifier ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; TemplateId nId = lcl_GetTemplateIdForService( aServiceSpecifier ); @@ -547,14 +547,14 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithA const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& /* Arguments */ ) throw (uno::Exception, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "createInstanceWithArguments: No arguments supported" ); return createInstance( ServiceSpecifier ); } uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::std::vector< OUString > aServices; const tTemplateMapType & rMap = lcl_DefaultChartTypeMap(); diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index b06e2ef0b457..f2deb8ac5dd7 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -140,7 +140,7 @@ ChartTypeTemplate::~ChartTypeTemplate() uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource( const uno::Reference< data::XDataSource >& xDataSource, const uno::Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< XDiagram > xDia; @@ -179,13 +179,13 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource } sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return sal_True; } void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! xDiagram.is()) return; @@ -263,7 +263,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( const Reference< chart2::XDiagram >& xDiagram, const Reference< chart2::data::XDataSource >& xDataSource, const Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! (xDiagram.is() && xDataSource.is()) ) @@ -318,7 +318,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool /* bAdaptProperties */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = sal_False; @@ -371,7 +371,7 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate( } Reference< chart2::XDataInterpreter > SAL_CALL ChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new DataInterpreter( GetComponentContext() ) ); @@ -384,7 +384,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 /* nSeriesIndex */, ::sal_Int32 /* nSeriesCount */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // sset stacking mode Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY ); @@ -439,7 +439,7 @@ void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram } void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // reset number format if we had percent stacking on sal_Bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT); @@ -520,7 +520,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram // ____ XServiceName ____ OUString SAL_CALL ChartTypeTemplate::getServiceName() - throw (uno::RuntimeException) + 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 fc81dfd62a9c..19278a2d1426 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -90,35 +90,35 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL createDiagramByDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// denotes if the chart needs categories at the first scale virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL changeDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL changeDiagramData( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, ::sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // still abstract: getChartTypeForNewSeries() virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) @@ -126,7 +126,7 @@ protected: // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // Methods to overload for automatic creation diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index cd41ea900ea2..ccc0563788de 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -140,14 +140,14 @@ ColumnChartType::~ColumnChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ColumnChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL ColumnChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_COLUMN; } @@ -170,7 +170,7 @@ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticColumnChartTypeInfo::get(); } diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index 3edbd7287cbb..3a03bba568c3 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -43,7 +43,7 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -53,11 +53,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 9c7fd8e26452..8db0c36624b4 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -161,7 +161,7 @@ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnLineChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticColumnLineChartTypeTemplateInfo::get(); } @@ -249,7 +249,7 @@ void SAL_CALL ColumnLineChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -280,7 +280,7 @@ StackMode ColumnLineChartTypeTemplate::getStackMode( sal_Int32 nChartTypeIndex ) sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate( const uno::Reference< XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = sal_False; @@ -377,7 +377,7 @@ Reference< chart2::XChartType > ColumnLineChartTypeTemplate::getChartTypeForInde Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -398,7 +398,7 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew } Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + 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 6c3c6344c878..e24f768e3a9c 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -60,27 +60,27 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual void createChartTypes( diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index f77dcc17fdc7..8202d8e5a796 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -55,7 +55,7 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException) + 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 1a04612ca167..319a1bec12fa 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -39,7 +39,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: sal_Int32 m_nNumberOfLines; diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 3e7a0c944d7f..ce454089b868 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -67,7 +67,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -142,7 +142,7 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -199,7 +199,7 @@ 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) + 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) + throw (uno::RuntimeException, std::exception) { vector< Reference< data::XLabeledDataSequence > > aResultVec; aResultVec.reserve( aInterpretedData.Series.getLength() + diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index 761e0f587e2e..84776c21a9e1 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -75,16 +75,16 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL mergeInterpretedData( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 4a71becbcaa3..1b8381c87c46 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -55,14 +55,14 @@ FilledNetChartType::~FilledNetChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new FilledNetChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL FilledNetChartType::getChartType() - throw (uno::RuntimeException) + throw (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 021d7f2f9ad9..2bd4ade19cd4 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -42,11 +42,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index dcb83a36c36a..7733ed5467a0 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -152,14 +152,14 @@ LineChartType::~LineChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LineChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL LineChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_LINE; } @@ -182,7 +182,7 @@ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticLineChartTypeInfo::get(); } diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 4b0b1c49b6da..e0db220f1e91 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -44,7 +44,7 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -54,11 +54,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 22838c4d2189..5d833df72297 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -183,7 +183,7 @@ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticLineChartTypeTemplateInfo::get(); } @@ -202,7 +202,7 @@ StackMode LineChartTypeTemplate::getStackMode( sal_Int32 /* nChartTypeIndex */ ) sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( const uno::Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -320,7 +320,7 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -357,7 +357,7 @@ void SAL_CALL LineChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + 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 570809d35306..43dd77eae7a1 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -62,25 +62,25 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index 8672c837b8fa..deef738a1ec1 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -57,7 +57,7 @@ NetChartType_Base::~NetChartType_Base() Reference< XCoordinateSystem > SAL_CALL NetChartType_Base::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( DimensionCount != 2 ) throw lang::IllegalArgumentException( @@ -139,7 +139,7 @@ struct StaticNetChartTypeInfo : public rtl::StaticAggregate< uno::Reference< bea // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL NetChartType_Base::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticNetChartTypeInfo::get(); } @@ -159,14 +159,14 @@ NetChartType::~NetChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new NetChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL NetChartType::getChartType() - throw (uno::RuntimeException) + throw (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 189ac094b2bf..123f78217d61 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -39,7 +39,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -50,7 +50,7 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; class NetChartType : public NetChartType_Base @@ -70,11 +70,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 9718c42877ae..0695c8846aaf 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -69,7 +69,7 @@ void SAL_CALL NetChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -91,7 +91,7 @@ void SAL_CALL NetChartTypeTemplate::applyStyle( sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -192,7 +192,7 @@ Reference< chart2::XChartType > NetChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem( aFormerlyUsedChartTypes, xResult ); diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index b8b3687fb25f..48462140950c 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -47,18 +47,18 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 99d01bc8e938..8fdd25d559c2 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -145,14 +145,14 @@ PieChartType::~PieChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PieChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL PieChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_PIE; } @@ -160,7 +160,7 @@ OUString SAL_CALL PieChartType::getChartType() Reference< chart2::XCoordinateSystem > SAL_CALL PieChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new PolarCoordinateSystem( @@ -214,7 +214,7 @@ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticPieChartTypeInfo::get(); } diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index 60e563f4c7e1..aefd34cbaed9 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -44,11 +44,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -60,11 +60,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index c1f05ccc006a..d25d283774fd 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -191,7 +191,7 @@ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticPieChartTypeTemplateInfo::get(); } @@ -311,7 +311,7 @@ void PieChartTypeTemplate::createChartTypes( sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( const uno::Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -422,7 +422,7 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -454,7 +454,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -541,7 +541,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( } void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + 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 9e4bebd2ce7a..b5fd2113f24a 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -61,28 +61,28 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual sal_Int32 getDimension() const; diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index b15c067572f9..2a569bbf5b30 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -168,7 +168,7 @@ ScatterChartType::~ScatterChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ScatterChartType( *this )); } @@ -177,7 +177,7 @@ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone() Reference< chart2::XCoordinateSystem > SAL_CALL ScatterChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( @@ -208,13 +208,13 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } OUString SAL_CALL ScatterChartType::getChartType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return CHART2_SERVICE_NAME_CHARTTYPE_SCATTER; } uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aMandRolesSeq(3); aMandRolesSeq[0] = "label"; @@ -224,7 +224,7 @@ uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles( } uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Sequence< OUString >(); } @@ -248,7 +248,7 @@ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticScatterChartTypeInfo::get(); } diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 25d3001bf76d..9f28410d0761 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -48,17 +48,17 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const @@ -70,11 +70,11 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index cd68e7ed9878..2312ae89bded 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -184,7 +184,7 @@ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticScatterChartTypeTemplateInfo::get(); } @@ -206,7 +206,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -228,7 +228,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( // ____ XChartTypeTemplate ____ sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return sal_False; } @@ -236,7 +236,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories() sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -354,7 +354,7 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex( Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -387,7 +387,7 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF } Reference< chart2::XDataInterpreter > SAL_CALL ScatterChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new XYDataInterpreter( GetComponentContext()) ); diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index 07d766e2a224..08f52443649b 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -60,29 +60,29 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 342bcfcecc87..d1d0b898ac52 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -199,7 +199,7 @@ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL StockChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticStockChartTypeTemplateInfo::get(); } @@ -225,7 +225,7 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); try @@ -270,7 +270,7 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( void SAL_CALL StockChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); if( getDimension() == 3 ) @@ -408,7 +408,7 @@ void StockChartTypeTemplate::createChartTypes( sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( const uno::Reference< XDiagram >& xDiagram, sal_Bool /* bAdaptProperties */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = sal_False; @@ -489,7 +489,7 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -510,7 +510,7 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie } Reference< XDataInterpreter > SAL_CALL StockChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new StockDataInterpreter( m_eStockVariant, GetComponentContext() ) ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 2d01d58ab85b..582413b61278 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -74,30 +74,30 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ChartTypeTemplate virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ); diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index e0714857117d..a425a8583f19 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -62,7 +62,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& rArguments, const Sequence< Reference< XDataSeries > >& rSeriesToReUse ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -263,7 +263,7 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( // volume to one with volume) sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // high/low/close sal_Int32 nNumberOfNecessarySequences = 3; @@ -320,7 +320,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( InterpretedData SAL_CALL StockDataInterpreter::reinterpretDataSeries( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + 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 5e2b1f3c6fa1..b33235586b5d 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -41,13 +41,13 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: StockChartTypeTemplate::StockVariant m_eStockVariant; diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index ebf9979ad40b..8bf2b03a9aaf 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -52,7 +52,7 @@ 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) + throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -145,7 +145,7 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -234,7 +234,7 @@ 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) + throw (uno::RuntimeException, std::exception) { Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 i=0; i& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); }; } // namespace chart diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 406606c5256d..13ce0b899ff5 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -238,7 +238,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( CachedDataSequence, CachedDataSequence_Base, O // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -264,7 +264,7 @@ APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, lcl_aServiceName ) // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -276,7 +276,7 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -288,20 +288,20 @@ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL CachedDataSequence::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return Impl_getMixedData(); } OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_sRole; } Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::LabelOrigin /*eLabelOrigin*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // return empty label, as we have no range representaions to determine something useful return Sequence< OUString >(); @@ -309,13 +309,13 @@ Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::L ::sal_Int32 SAL_CALL CachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 /*nIndex*/ ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return 0; } Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { CachedDataSequence * pNewSeq = new CachedDataSequence( *this ); @@ -323,7 +323,7 @@ Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() } void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -337,7 +337,7 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod } void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -351,7 +351,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) +void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) { ::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 df8d4fe19ae4..821f06923a52 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -143,7 +143,7 @@ void ConfigColorScheme::retrieveConfigColors() // ____ XColorScheme ____ ::sal_Int32 SAL_CALL ConfigColorScheme::getColorByIndex( ::sal_Int32 nIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bNeedsUpdate ) retrieveConfigColors(); diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 505c5335cebd..f81571142c31 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -50,14 +50,14 @@ DataSource::~DataSource() // ____ XDataSource ____ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSource::getDataSequences() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aDataSeq; } // ____ XDataSink ____ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aDataSeq = aData; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index d5c90e88d773..1469e8e5774d 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -127,14 +127,14 @@ ErrorBar::~ErrorBar() {} uno::Reference< util::XCloneable > SAL_CALL ErrorBar::createClone() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > aRef ( new SfxItemPropertySetInfo( GetErrorBarPropertySet()->getPropertyMap() ) ); @@ -143,7 +143,7 @@ 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) + lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -216,7 +216,7 @@ OUString getSourceRangeStrFromLabeledSequences( uno::Sequence< uno::Reference< c } uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -269,7 +269,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) } beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException) + throw (com::sun::star::beans::UnknownPropertyException, std::exception) { if(rPropName == "ErrorBarStyle") { @@ -340,7 +340,7 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) } uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Sequence< OUString >& rPropNames ) - throw (com::sun::star::beans::UnknownPropertyException) + throw (com::sun::star::beans::UnknownPropertyException, std::exception) { uno::Sequence< beans::PropertyState > aRet( rPropNames.getLength() ); for(sal_Int32 i = 0; i < rPropNames.getLength(); ++i) @@ -351,41 +351,41 @@ uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Se } void ErrorBar::setPropertyToDefault( const OUString& ) - throw (beans::UnknownPropertyException) + throw (beans::UnknownPropertyException, std::exception) { //keep them unimplemented for now } uno::Any ErrorBar::getPropertyDefault( const OUString& ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) { //keep them unimplemented for now return uno::Any(); } void ErrorBar::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } void ErrorBar::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } void ErrorBar::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } void ErrorBar::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { } // ____ XModifyBroadcaster ____ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -399,7 +399,7 @@ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyLi } void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -414,21 +414,21 @@ void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModif // ____ XModifyListener ____ void SAL_CALL ErrorBar::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } // ____ XDataSink ____ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ModifyListenerHelper::removeListenerFromAllElements( m_aDataSequences, m_xModifyEventForwarder ); EventListenerHelper::removeListenerFromAllElements( m_aDataSequences, this ); @@ -439,7 +439,7 @@ 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) + throw (uno::RuntimeException, std::exception) { return ContainerHelper::ContainerToSequence( m_aDataSequences ); } diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index 876067587211..6cb949044733 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -44,7 +44,7 @@ ExponentialRegressionCurveCalculator::~ExponentialRegressionCurveCalculator() void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -91,7 +91,7 @@ void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( double SAL_CALL ExponentialRegressionCurveCalculator::getCurveValue( double x ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -111,7 +111,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index fe70d7c59066..e2874961da1c 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -585,7 +585,7 @@ void InternalDataProvider::createDefaultData() // ____ XDataProvider ____ ::sal_Bool SAL_CALL InternalDataProvider::createDataSourcePossible( const Sequence< beans::PropertyValue >& /* aArguments */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return true; } @@ -611,7 +611,7 @@ 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) + uno::RuntimeException, std::exception) { OUString aRangeRepresentation; bool bUseColumns = true; @@ -701,7 +701,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( const Reference< chart2::data::XDataSource >& /* xDataSource */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< beans::PropertyValue > aArguments( 4 ); aArguments[0] = beans::PropertyValue( @@ -726,7 +726,7 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( } ::sal_Bool SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& /* aRangeRepresentation */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return true; } @@ -734,7 +734,7 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aRangeRepresentation.match( lcl_aCategoriesRangeName )) { @@ -766,7 +766,7 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa } Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelection() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // there is no range selection component return Reference< sheet::XRangeSelection >(); @@ -774,7 +774,7 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec // ____ XInternalDataProvider ____ ::sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Bool bResult = false; @@ -798,7 +798,7 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec } Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< uno::Any > aResult; @@ -872,7 +872,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( const OUString& aRange, const Sequence< uno::Any >& aNewData ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) ); if( aRange.match( lcl_aLabelRangePrefix ) ) @@ -938,7 +938,7 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( } void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) { @@ -953,7 +953,7 @@ void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) } void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { lcl_deleteMapReferences( OUString::number( nAtIndex )); lcl_deleteMapReferences( lcl_aLabelRangePrefix + OUString::number( nAtIndex )); @@ -970,7 +970,7 @@ void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) } void SAL_CALL InternalDataProvider::appendSequence() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.appendColumn(); @@ -979,7 +979,7 @@ void SAL_CALL InternalDataProvider::appendSequence() } void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel ) - throw (uno::RuntimeException) + 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 ) @@ -996,7 +996,7 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel } } void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel ) - throw (uno::RuntimeException) + 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 ) @@ -1014,7 +1014,7 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel } void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1038,7 +1038,7 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1062,7 +1062,7 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.swapRowWithNext( nAtIndex ); @@ -1082,7 +1082,7 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s } void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( xSeq.is()) lcl_addDataSequenceToMap( xSeq->getSourceRangeRepresentation(), xSeq ); @@ -1091,7 +1091,7 @@ void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Refere // ____ XRangeXMLConversion ____ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRangeRepresentation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange; aRange.aTableName = "local-table"; @@ -1169,7 +1169,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXMLRange ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange( XMLRangeHelper::getCellRangeFromXMLString( aXMLRange )); if( aRange.aUpperLeft.bIsEmpty ) @@ -1298,7 +1298,7 @@ uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStr }//anonymous namespace // ____ XDateCategories ____ -Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException) +Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException, std::exception) { double fNan = InternalDataProvider::getNotANumber(); double fValue = fNan; @@ -1316,7 +1316,7 @@ Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno return aDoubles; } -void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) { sal_Int32 nCount = rDates.getLength(); vector< vector< uno::Any > > aNewCategories; @@ -1336,56 +1336,56 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& } // ____ XAnyDescriptionAccess ____ -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexRowLabels() ); } -void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) { m_aInternalData.setComplexRowLabels( lcl_convertSequenceSequenceToVectorVector( aRowDescriptions ) ); } -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception) { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexColumnLabels() ); } -void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) { m_aInternalData.setComplexColumnLabels( lcl_convertSequenceSequenceToVectorVector( aColumnDescriptions ) ); } // ____ XComplexDescriptionAccess ____ -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) { return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() ); } -void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) { m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) ); } -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) { return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() ); } -void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) { m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) ); } // ____ XChartDataArray ____ Sequence< Sequence< double > > SAL_CALL InternalDataProvider::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aInternalData.getData(); } void SAL_CALL InternalDataProvider::setData( const Sequence< Sequence< double > >& rDataInRows ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aInternalData.setData( rDataInRows ); } void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString >& aRowDescriptions ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aRowDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aRowDescriptions.getConstArray(), @@ -1394,7 +1394,7 @@ void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString } void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUString >& aColumnDescriptions ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aColumnDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aColumnDescriptions.getConstArray(), @@ -1403,7 +1403,7 @@ void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUStr } Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexRowLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1411,7 +1411,7 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() } Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexColumnLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1421,18 +1421,18 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL InternalDataProvider::addChartDataChangeEventListener( const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } void SAL_CALL InternalDataProvider::removeChartDataChangeEventListener( const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } double SAL_CALL InternalDataProvider::getNotANumber() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fNan; ::rtl::math::setNan( & fNan ); @@ -1440,13 +1440,13 @@ double SAL_CALL InternalDataProvider::getNotANumber() } ::sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber ) - throw (uno::RuntimeException) + 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) +void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) { comphelper::SequenceAsHashMap aArgs(_aArguments); if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData" ,sal_False) ) @@ -1454,7 +1454,7 @@ void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & } // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new InternalDataProvider( *this )); } diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 68df3c83520c..84609b9c2cb7 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -66,14 +66,14 @@ LabeledDataSequence::~LabeledDataSequence() // ____ XLabeledDataSequence ____ uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getValues() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_xData; } void SAL_CALL LabeledDataSequence::setValues( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xData != xSequence ) { @@ -84,14 +84,14 @@ void SAL_CALL LabeledDataSequence::setValues( } uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getLabel() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_xLabel; } void SAL_CALL LabeledDataSequence::setLabel( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( m_xLabel != xSequence ) { @@ -103,7 +103,7 @@ void SAL_CALL LabeledDataSequence::setLabel( // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Reference< chart2::data::XDataSequence > xNewValues( m_xData ); uno::Reference< chart2::data::XDataSequence > xNewLabel( m_xLabel ); @@ -122,7 +122,7 @@ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -136,7 +136,7 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo } void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index ec328926ce8b..7ed0c00ef765 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -41,7 +41,7 @@ void LinearRegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { PolynomialRegressionCurveCalculator::setRegressionProperties( 1, @@ -56,7 +56,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LinearRegressionCurveCalculator: const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index 58e92a1e3330..a00a0cdde976 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -44,7 +44,7 @@ LogarithmicRegressionCurveCalculator::~LogarithmicRegressionCurveCalculator() void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -90,7 +90,7 @@ void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( double SAL_CALL LogarithmicRegressionCurveCalculator::getCurveValue( double x ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -110,7 +110,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LogarithmicRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index e94861456e05..c263d48b2770 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -41,7 +41,7 @@ MeanValueRegressionCurveCalculator::~MeanValueRegressionCurveCalculator() void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& /*aXValues*/, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const sal_Int32 nDataLength = aYValues.getLength(); sal_Int32 nMax = nDataLength; @@ -88,7 +88,7 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( double SAL_CALL MeanValueRegressionCurveCalculator::getCurveValue( double /*x*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return m_fMeanValue; } @@ -99,7 +99,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MeanValueRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation ) { diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index 15834b891522..3dcd37a05faa 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -42,10 +42,10 @@ public: void stopListening(); //XModifyListener - virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException); + virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception); //XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception); using ::cppu::WeakComponentImplHelperBase::disposing; @@ -66,13 +66,13 @@ ModifyListenerCallBack_impl::~ModifyListenerCallBack_impl() } //XModifyListener -void SAL_CALL ModifyListenerCallBack_impl::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException) +void SAL_CALL ModifyListenerCallBack_impl::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException, std::exception) { m_aLink.Call(0); } //XEventListener -void SAL_CALL ModifyListenerCallBack_impl::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException) +void SAL_CALL ModifyListenerCallBack_impl::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) { m_xBroadcaster.clear(); } diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 36c62ee7f9ff..3245ca527c1a 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -163,27 +163,27 @@ void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSou // ____ XModifyBroadcaster ____ void SAL_CALL ModifyEventForwarder::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { AddListener( aListener ); } void SAL_CALL ModifyEventForwarder::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { RemoveListener( aListener ); } // ____ XModifyListener ____ void SAL_CALL ModifyEventForwarder::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { FireEvent( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ModifyEventForwarder::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index 55193f11b210..ee61c9c7cd9a 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -41,7 +41,7 @@ MovingAverageRegressionCurveCalculator::~MovingAverageRegressionCurveCalculator( void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::rtl::math::setNan( & m_fCorrelationCoeffitient ); @@ -74,7 +74,7 @@ void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( double SAL_CALL MovingAverageRegressionCurveCalculator::getCurveValue( double /*x*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); @@ -87,7 +87,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MovingAverageRegressionCurveCalc const uno::Reference< chart2::XScaling >& /*xScalingY*/, sal_Bool /*bMaySkipPointsInCalculation*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + 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 c7b7507b729e..8961dd7b51df 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -59,19 +59,19 @@ NameContainer::~NameContainer() //XServiceInfo OUString SAL_CALL NameContainer::getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return m_aImplementationName; } sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = m_aServicename; @@ -80,7 +80,7 @@ Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( m_aMap.find( rName ) != m_aMap.end() ) throw container::ElementExistException(); @@ -88,7 +88,7 @@ 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) + throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { tContentMap::iterator aIt( m_aMap.find( Name )); if( aIt == m_aMap.end()) @@ -98,7 +98,7 @@ 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 ) + throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { tContentMap::iterator aIt( m_aMap.find( rName )); if( aIt == m_aMap.end() ) @@ -108,7 +108,7 @@ 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) + throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { tContentMap::iterator aIter( m_aMap.find( rName ) ); if( aIter == m_aMap.end() ) @@ -117,7 +117,7 @@ Any SAL_CALL NameContainer::getByName( const OUString& rName ) } Sequence< OUString > SAL_CALL NameContainer::getElementNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { sal_Int32 nCount = m_aMap.size(); Sequence< OUString > aSeq(nCount); @@ -128,27 +128,27 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames() } sal_Bool SAL_CALL NameContainer::hasByName( const OUString& rName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ( m_aMap.find( rName ) != m_aMap.end() ); } // XElementAccess sal_Bool SAL_CALL NameContainer::hasElements() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ! m_aMap.empty(); } uno::Type SAL_CALL NameContainer::getElementType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aType; } // XCloneable uno::Reference< util::XCloneable > SAL_CALL NameContainer::createClone() - throw ( uno::RuntimeException ) + 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 db4efffd5057..304e101b5514 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -79,7 +79,7 @@ void OPropertySet::disposePropertySet() } Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ::cppu::queryInterface( aType, @@ -97,7 +97,7 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) // // ____ XTypeProvider ____ Sequence< uno::Type > SAL_CALL OPropertySet::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { static Sequence< uno::Type > aTypeList; @@ -128,7 +128,7 @@ namespace Sequence< sal_Int8 > SAL_CALL OPropertySet::getImplementationId() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theOPropertySetImplementationId::get().getSeq(); } @@ -137,7 +137,7 @@ Sequence< sal_Int8 > SAL_CALL beans::PropertyState SAL_CALL OPropertySet::getPropertyState( const OUString& PropertyName ) throw (beans::UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -148,7 +148,7 @@ beans::PropertyState SAL_CALL Sequence< beans::PropertyState > SAL_CALL OPropertySet::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw (beans::UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -164,7 +164,7 @@ Sequence< beans::PropertyState > SAL_CALL void SAL_CALL OPropertySet::setPropertyToDefault( const OUString& PropertyName ) throw (beans::UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -176,7 +176,7 @@ Any SAL_CALL OPropertySet::getPropertyDefault( const OUString& aPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -190,7 +190,7 @@ Any SAL_CALL void SAL_CALL OPropertySet::setAllPropertiesToDefault() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_pImplProperties->SetAllPropertiesToDefault(); firePropertyChangeEvent(); @@ -199,7 +199,7 @@ void SAL_CALL void SAL_CALL OPropertySet::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -216,7 +216,7 @@ Sequence< Any > SAL_CALL OPropertySet::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::cppu::IPropertyArrayHelper & rPH = getInfoHelper(); const sal_Int32 nElements = aPropertyNames.getLength(); @@ -271,7 +271,7 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const Any& rValue ) - throw (uno::Exception) + throw (uno::Exception, std::exception) { #if OSL_DEBUG_LEVEL > 0 if( rValue.hasValue()) @@ -385,14 +385,14 @@ void OPropertySet::firePropertyChangeEvent() // ____ XStyleSupplier ____ Reference< style::XStyle > SAL_CALL OPropertySet::getStyle() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_pImplProperties->GetStyle(); } void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( ! m_pImplProperties->SetStyle( xStyle )) throw lang::IllegalArgumentException( @@ -407,7 +407,7 @@ void SAL_CALL OPropertySet::setPropertyValues( throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { ::cppu::OPropertySetHelper::setPropertyValues( PropertyNames, Values ); @@ -419,7 +419,7 @@ void SAL_CALL OPropertySet::setFastPropertyValue( sal_Int32 nHandle, const Any& throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException) + 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 21b564d63d08..90be5a163af5 100644 --- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx @@ -40,7 +40,7 @@ PolynomialRegressionCurveCalculator::~PolynomialRegressionCurveCalculator() void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { rtl::math::setNan(&m_fCorrelationCoeffitient); @@ -200,7 +200,7 @@ void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( double SAL_CALL PolynomialRegressionCurveCalculator::getCurveValue( double x ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); @@ -227,7 +227,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PolynomialRegressionCurveCalcula const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return RegressionCurveCalculator::getCurveValues( min, max, nPointCount, xScalingX, xScalingY, bMaySkipPointsInCalculation ); diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 0d0898008fbf..0489eeaba995 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -44,7 +44,7 @@ PotentialRegressionCurveCalculator::~PotentialRegressionCurveCalculator() void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -92,7 +92,7 @@ void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( double SAL_CALL PotentialRegressionCurveCalculator::getCurveValue( double x ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -112,7 +112,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PotentialRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingY, ::sal_Bool bMaySkipPointsInCalculation ) throw (lang::IllegalArgumentException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index bbe879f77ca5..6a865a175cec 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -75,7 +75,7 @@ RangeHighlighter::~RangeHighlighter() // ____ XRangeHighlighter ____ Sequence< chart2::data::HighlightedRange > SAL_CALL RangeHighlighter::getSelectedRanges() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aSelectedRanges; } @@ -298,7 +298,7 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface } void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if(!xListener.is()) return; @@ -314,7 +314,7 @@ void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< vie } void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { rBHelper.removeListener( ::getCppuType( & xListener ), xListener ); --m_nAddedListenerCount; @@ -324,7 +324,7 @@ void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< // ____ XSelectionChangeListener ____ void SAL_CALL RangeHighlighter::selectionChanged( const lang::EventObject& /*aEvent*/ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { determineRanges(); @@ -351,7 +351,7 @@ void RangeHighlighter::fireSelectionEvent() } void SAL_CALL RangeHighlighter::disposing( const lang::EventObject& Source ) - throw (uno::RuntimeException) + 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 d05fd44d6bfc..694e056e6b9f 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -73,7 +73,7 @@ void RegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { mDegree = aDegree; mForceIntercept = aForceIntercept; @@ -101,7 +101,7 @@ 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) + throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if( nPointCount < 2 ) throw lang::IllegalArgumentException(); @@ -137,13 +137,13 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa } double SAL_CALL RegressionCurveCalculator::getCorrelationCoefficient() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_fCorrelationCoeffitient; } OUString SAL_CALL RegressionCurveCalculator::getRepresentation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ImplGetRepresentation( Reference< util::XNumberFormatter >(), 0 ); } @@ -151,7 +151,7 @@ OUString SAL_CALL RegressionCurveCalculator::getRepresentation() OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation( const Reference< util::XNumberFormatsSupplier > & xNumFmtSupplier, sal_Int32 nNumberFormatKey ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // create and prepare a number formatter if( !xNumFmtSupplier.is()) diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 2ff4f4523e9d..f921ae82343c 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -216,19 +216,19 @@ RegressionCurveModel::~RegressionCurveModel() // ____ XRegressionCurve ____ uno::Reference< chart2::XRegressionCurveCalculator > SAL_CALL RegressionCurveModel::getCalculator() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( getServiceName()); } uno::Reference< beans::XPropertySet > SAL_CALL RegressionCurveModel::getEquationProperties() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_xEquationProperties; } void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< beans::XPropertySet >& xEquationProperties ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( xEquationProperties.is()) { @@ -243,7 +243,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< // ____ XServiceName ____ OUString SAL_CALL RegressionCurveModel::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { switch( m_eRegressionCurveType ) { @@ -268,7 +268,7 @@ OUString SAL_CALL RegressionCurveModel::getServiceName() // ____ XModifyBroadcaster ____ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -282,7 +282,7 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti } void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -297,14 +297,14 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< // ____ XModifyListener ____ void SAL_CALL RegressionCurveModel::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -338,7 +338,7 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL RegressionCurveModel::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticRegressionCurveInfo::get(); } @@ -372,7 +372,7 @@ uno::Sequence< OUString > MeanValueRegressionCurve::getSupportedServiceNames_Sta APPHELPER_XSERVICEINFO_IMPL( MeanValueRegressionCurve, lcl_aImplementationName_MeanValue ); uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new MeanValueRegressionCurve( *this )); } @@ -398,7 +398,7 @@ uno::Sequence< OUString > LinearRegressionCurve::getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( LinearRegressionCurve, lcl_aImplementationName_Linear ); uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LinearRegressionCurve( *this )); } @@ -424,7 +424,7 @@ uno::Sequence< OUString > LogarithmicRegressionCurve::getSupportedServiceNames_S APPHELPER_XSERVICEINFO_IMPL( LogarithmicRegressionCurve, lcl_aImplementationName_Logarithmic ); uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LogarithmicRegressionCurve( *this )); } @@ -450,7 +450,7 @@ uno::Sequence< OUString > ExponentialRegressionCurve::getSupportedServiceNames_S APPHELPER_XSERVICEINFO_IMPL( ExponentialRegressionCurve, lcl_aImplementationName_Exponential ); uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ExponentialRegressionCurve( *this )); } @@ -476,7 +476,7 @@ uno::Sequence< OUString > PotentialRegressionCurve::getSupportedServiceNames_Sta APPHELPER_XSERVICEINFO_IMPL( PotentialRegressionCurve, lcl_aImplementationName_Potential ); uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PotentialRegressionCurve( *this )); } @@ -502,7 +502,7 @@ uno::Sequence< OUString > PolynomialRegressionCurve::getSupportedServiceNames_St APPHELPER_XSERVICEINFO_IMPL( PolynomialRegressionCurve, lcl_aImplementationName_Polynomial ); uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PolynomialRegressionCurve( *this )); } @@ -528,7 +528,7 @@ uno::Sequence< OUString > MovingAverageRegressionCurve::getSupportedServiceNames APPHELPER_XSERVICEINFO_IMPL( MovingAverageRegressionCurve, lcl_aImplementationName_MovingAverage ); uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone() - throw (uno::RuntimeException) + 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 a077b687b43e..3da827761450 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -88,21 +88,21 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XRegressionCurve ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getEquationProperties() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setEquationProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xEquationProperties ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ // not implemented here @@ -112,20 +112,20 @@ protected: // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); using ::cppu::OPropertySetHelper::disposing; @@ -159,7 +159,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -179,7 +179,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -199,7 +199,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -219,7 +219,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -239,7 +239,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -259,7 +259,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -279,7 +279,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index acbc9e55a2fc..22f67a413c1d 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -197,7 +197,7 @@ RegressionEquation::~RegressionEquation() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new RegressionEquation( *this )); } @@ -220,14 +220,14 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL RegressionEquation::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return *StaticRegressionEquationInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -241,7 +241,7 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util: } void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { @@ -256,14 +256,14 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut // ____ XModifyListener ____ void SAL_CALL RegressionEquation::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { // nothing } @@ -281,14 +281,14 @@ void RegressionEquation::fireModifyEvent() // ____ XTitle ____ uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText() - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); ModifyListenerHelper::removeListenerFromAllElements( diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 2546071cd052..f3239fe77885 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -76,39 +76,39 @@ protected: // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XTitle ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& Strings ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); using ::cppu::OPropertySetHelper::disposing; diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 7b710ceeeb7a..e30f8d0b5037 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -55,7 +55,7 @@ LogarithmicScaling::~LogarithmicScaling() double SAL_CALL LogarithmicScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -67,14 +67,14 @@ LogarithmicScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL LogarithmicScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return new ExponentialScaling( m_fBase ); } OUString SAL_CALL LogarithmicScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_Logarithmic; } @@ -104,7 +104,7 @@ ExponentialScaling::~ExponentialScaling() double SAL_CALL ExponentialScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -116,14 +116,14 @@ ExponentialScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL ExponentialScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return new LogarithmicScaling( m_fBase ); } OUString SAL_CALL ExponentialScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_Exponential; } @@ -151,7 +151,7 @@ LinearScaling::~LinearScaling() {} double SAL_CALL LinearScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -163,7 +163,7 @@ double SAL_CALL LinearScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL LinearScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fSlope == 0 ) @@ -174,7 +174,7 @@ uno::Reference< XScaling > SAL_CALL OUString SAL_CALL LinearScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_Linear; } @@ -200,7 +200,7 @@ PowerScaling::~PowerScaling() {} double SAL_CALL PowerScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -212,7 +212,7 @@ double SAL_CALL PowerScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL PowerScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fExponent == 0 ) @@ -223,7 +223,7 @@ uno::Reference< XScaling > SAL_CALL OUString SAL_CALL PowerScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_Power; } diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index aff3f2a13093..6498e57d3cc1 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -134,7 +134,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Bas // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -160,7 +160,7 @@ APPHELPER_XSERVICEINFO_IMPL( UncachedDataSequence, lcl_aServiceName ) // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< double > aResult; MutexGuard aGuard( GetMutex() ); @@ -176,7 +176,7 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< OUString > aResult; MutexGuard aGuard( GetMutex() ); @@ -192,7 +192,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL UncachedDataSequence::getData() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); if( m_xDataProvider.is()) @@ -201,13 +201,13 @@ Sequence< Any > SAL_CALL UncachedDataSequence::getData() } OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getName(); } Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data::LabelOrigin ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { // auto-generated label is an empty string return Sequence< OUString >(1); @@ -215,7 +215,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data: ::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return m_nNumberFormatKey; } @@ -225,7 +225,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); Sequence< Any > aData( getData()); @@ -240,7 +240,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno // ____ XIndexAccess (base of XIndexReplace) ____ ::sal_Int32 SAL_CALL UncachedDataSequence::getCount() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return 0; @@ -249,7 +249,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return uno::Any(); @@ -257,13 +257,13 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) // ____ XElementAccess (base of XIndexAccess) ____ uno::Type SAL_CALL UncachedDataSequence::getElementType() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ::getCppuType( reinterpret_cast< uno::Any * >(0)); } ::sal_Bool SAL_CALL UncachedDataSequence::hasElements() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { if( ! m_xDataProvider.is()) return sal_False; @@ -272,20 +272,20 @@ uno::Type SAL_CALL UncachedDataSequence::getElementType() // ____ XNamed ____ OUString SAL_CALL UncachedDataSequence::getName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_aSourceRepresentation; } void SAL_CALL UncachedDataSequence::setName( const OUString& aName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aSourceRepresentation = aName; fireModifyEvent(); } Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { UncachedDataSequence * pNewSeq = new UncachedDataSequence( *this ); return Reference< util::XCloneable >( pNewSeq ); @@ -293,14 +293,14 @@ Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() // ____ XModifiable ____ ::sal_Bool SAL_CALL UncachedDataSequence::isModified() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return sal_False; } void SAL_CALL UncachedDataSequence::setModified( ::sal_Bool bModified ) throw (beans::PropertyVetoException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( bModified ) fireModifyEvent(); @@ -308,7 +308,7 @@ 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) + throw (uno::RuntimeException, std::exception) { try { @@ -322,7 +322,7 @@ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XM } void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { try { diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index fc5429337d80..3a19c1807a99 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -36,7 +36,7 @@ WeakModifyListenerAdapter::~WeakModifyListenerAdapter() {} void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModListener( getListener() ); if( xModListener.is()) @@ -52,7 +52,7 @@ WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter() {} void SAL_CALL WeakSelectionChangeListenerAdapter::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< view::XSelectionChangeListener > xSelChgListener( getListener() ); if( xSelChgListener.is()) diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index b967bd128f69..86c4195003e2 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -71,7 +71,7 @@ void WrappedPropertySet::clearWrappedPropertySet() //XPropertySet Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySetInfo( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySetInfo > xInfo = m_xInfo; if( !xInfo.is() ) @@ -93,7 +93,7 @@ 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) + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { try { @@ -140,7 +140,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam } } Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -184,7 +184,7 @@ 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -197,7 +197,7 @@ 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -210,7 +210,7 @@ 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -223,7 +223,7 @@ 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -238,7 +238,7 @@ 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) + throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { bool bUnknownProperty = false; sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); @@ -262,7 +262,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& // throw beans::UnknownPropertyException(); } Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -288,19 +288,19 @@ 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) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo } void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException) + 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) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo @@ -308,7 +308,7 @@ void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUS //XPropertyState beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -339,7 +339,7 @@ const WrappedProperty* WrappedPropertySet::getWrappedProperty( sal_Int32 nHandle } Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -355,7 +355,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( } void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); if( xInnerPropertyState.is() ) @@ -368,7 +368,7 @@ void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropert } } Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); @@ -385,7 +385,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyNa //XMultiPropertyStates void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = getPropertySequence(); for(sal_Int32 nN=0; nN& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException) + 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) + 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 685a5690c48a..86eeea128c14 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -51,7 +51,7 @@ DateScaling::~DateScaling() } double SAL_CALL DateScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult(value); if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -92,13 +92,13 @@ double SAL_CALL DateScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } OUString SAL_CALL DateScaling::getServiceName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return lcl_aServiceName_DateScaling; } @@ -123,7 +123,7 @@ InverseDateScaling::~InverseDateScaling() } double SAL_CALL InverseDateScaling::doScaling( double value ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { double fResult(value); if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -171,13 +171,13 @@ double SAL_CALL InverseDateScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } OUString SAL_CALL InverseDateScaling::getServiceName() - throw (uno::RuntimeException) + throw (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 44411a1b168b..74c784b794d6 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -48,15 +48,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const Date m_aNullDate; @@ -80,15 +80,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: const Date m_aNullDate; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index fe1aab84f37a..956ff81485a1 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -46,7 +46,7 @@ public: //XTextualDataSequence virtual uno::Sequence< OUString > SAL_CALL getTextualData() - throw ( uno::RuntimeException) + throw ( uno::RuntimeException, std::exception) { return m_aTextSequence; } diff --git a/chart2/source/view/inc/DummyXShape.hxx b/chart2/source/view/inc/DummyXShape.hxx index 4783cf696218..2a07094a5b42 100644 --- a/chart2/source/view/inc/DummyXShape.hxx +++ b/chart2/source/view/inc/DummyXShape.hxx @@ -109,54 +109,54 @@ public: DummyXShape(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // normal non UNO methods @@ -337,9 +337,9 @@ public: virtual void render() SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); private: void setTransformatAsProperty(const com::sun::star::drawing::HomogenMatrix3& rMatrix); @@ -364,22 +364,22 @@ class DummyXShapes : public DummyXShape, public com::sun::star::drawing::XShapes { public: - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Any SAL_CALL queryAggregation( const com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Any SAL_CALL queryAggregation( const com::sun::star::uno::Type& rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // normal methods virtual void render(); @@ -396,8 +396,8 @@ public: ~DummyChart(); virtual DummyChart* getRootShape(); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void render() SAL_OVERRIDE; @@ -422,10 +422,10 @@ class DummyGroup2D : public DummyXShapes public: DummyGroup2D(const OUString& rName); - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); }; class DummyGroup3D : public DummyXShapes diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index e8510af3d5e9..d27bc7d39104 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -39,13 +39,13 @@ public: virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: ::com::sun::star::drawing::HomogenMatrix m_Matrix; diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index 43554cff8210..470952f9c8d5 100644 --- a/chart2/source/view/inc/VPolarTransformation.hxx +++ b/chart2/source/view/inc/VPolarTransformation.hxx @@ -39,13 +39,13 @@ public: virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); private: PolarPlottingPositionHelper m_aPositionHelper; diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index c972af0bd04d..99e7b348c8e8 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -185,7 +185,7 @@ void ChartView::init() } void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& ) - throw ( uno::Exception, uno::RuntimeException) + throw ( uno::Exception, uno::RuntimeException, std::exception) { init(); } @@ -289,7 +289,7 @@ 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) + throw (datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception) { bool bHighContrastMetaFile( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast)); uno::Any aRet; @@ -323,7 +323,7 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF return aRet; } uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFlavors() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aRet(2); @@ -337,7 +337,7 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla return aRet; } ::sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) || aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) ); @@ -345,7 +345,7 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { if( aIdentifier.getLength() == 16 && 0 == memcmp( ExplicitValueProvider::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) @@ -2623,7 +2623,7 @@ void ChartView::createShapes() // util::XEventListener (base of XCloseListener) void SAL_CALL ChartView::disposing( const lang::EventObject& /* rSource */ ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { } @@ -2696,7 +2696,7 @@ void ChartView::impl_updateView() // ____ XModifyListener ____ void SAL_CALL ChartView::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_bViewDirty = true; if( m_bInViewUpdate ) @@ -2794,24 +2794,24 @@ void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode ) // ____ XModeChangeBroadcaster ____ void SAL_CALL ChartView::addModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( ::getCppuType((const uno::Reference< util::XModeChangeListener >*)0), xListener ); } void SAL_CALL ChartView::removeModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( ::getCppuType((const uno::Reference< util::XModeChangeListener >*)0), xListener ); } void SAL_CALL ChartView::addModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ ) - throw (lang::NoSupportException, uno::RuntimeException) + throw (lang::NoSupportException, uno::RuntimeException, std::exception) { } void SAL_CALL ChartView::removeModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ ) - throw (lang::NoSupportException, uno::RuntimeException) + throw (lang::NoSupportException, uno::RuntimeException, std::exception) { } @@ -2832,7 +2832,7 @@ void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception) // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return 0; @@ -2841,7 +2841,7 @@ 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) + , lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( rPropertyName.equals("Resolution") ) { @@ -2894,7 +2894,7 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName } Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; if( rPropertyName.equals("Resolution") ) @@ -2908,25 +2908,25 @@ 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) + 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) + 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) + 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) + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -2934,7 +2934,7 @@ void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* Proper // ____ XMultiServiceFactory ____ Reference< uno::XInterface > ChartView::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { SdrModel* pModel = ( m_pDrawModelWrapper ? &m_pDrawModelWrapper->getSdrModel() : NULL ); if ( pModel ) @@ -2993,14 +2993,14 @@ 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) + 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) +uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aServiceNames( 6 ); diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 6b28c43b4aee..8d4ac25efb2a 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -56,26 +56,26 @@ public: mrProperties(rProps) {} virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException); + throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception); virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); private: const std::map& mrProperties; }; sal_Bool SAL_CALL DummyPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException) + 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) + throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) { beans::Property aRet; if(mrProperties.find(rName) == mrProperties.end()) @@ -89,7 +89,7 @@ beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString } uno::Sequence< beans::Property > SAL_CALL DummyPropertySetInfo::getProperties() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > aRet(mrProperties.size()); @@ -134,49 +134,49 @@ DummyXShape::DummyXShape() } OUString SAL_CALL DummyXShape::getName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maName; } void SAL_CALL DummyXShape::setName( const OUString& rName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { maName = rName; } awt::Point SAL_CALL DummyXShape::getPosition() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maPosition; } void SAL_CALL DummyXShape::setPosition( const awt::Point& rPoint ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { maPosition = rPoint; } awt::Size SAL_CALL DummyXShape::getSize() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maSize; } void SAL_CALL DummyXShape::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException) + throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { maSize = rSize; } OUString SAL_CALL DummyXShape::getShapeType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("dummy shape"); } uno::Reference< beans::XPropertySetInfo > SAL_CALL DummyXShape::getPropertySetInfo() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return new DummyPropertySetInfo(maProperties); } @@ -184,7 +184,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL DummyXShape::getPropertySetIn void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::Any& rValue) throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { SAL_WARN("chart2", "DummyXShape::setProperty: " << rName << " " << "Any"); maProperties[rName] = rValue; @@ -195,7 +195,7 @@ 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) + throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("chart2.opengl", "DummyXShape::getPropertyValue: " << rName); std::map::iterator itr = maProperties.find(rName); @@ -206,29 +206,29 @@ 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) + 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) + 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) + 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) + 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) + lang::WrappedTargetException, uno::RuntimeException, std::exception) { size_t n = std::min(rNames.getLength(), rValues.getLength()); for(size_t i = 0; i < n; ++i) @@ -239,7 +239,7 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException, uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues( const uno::Sequence< OUString >& rNames) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Any > aValues(rNames.getLength()); for(sal_Int32 i = 0; i < rNames.getLength(); ++i) @@ -253,22 +253,22 @@ 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) +void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) { } -void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException) +void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { } OUString SAL_CALL DummyXShape::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return OUString("DummyXShape"); } @@ -292,25 +292,25 @@ uno::Sequence< OUString > listSupportedServices() } uno::Sequence< OUString > SAL_CALL DummyXShape::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return listSupportedServices(); } sal_Bool SAL_CALL DummyXShape::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Reference< uno::XInterface > SAL_CALL DummyXShape::getParent() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return mxParent; } void SAL_CALL DummyXShape::setParent( const uno::Reference< uno::XInterface >& xParent ) - throw(lang::NoSupportException, uno::RuntimeException) + throw(lang::NoSupportException, uno::RuntimeException, std::exception) { mxParent = xParent; } @@ -856,7 +856,7 @@ 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) + uno::RuntimeException, std::exception) { SAL_WARN("chart2.opengl", "property value set after image has been created"); SAL_WARN("chart2.opengl", rName); @@ -864,7 +864,7 @@ void SAL_CALL DummyText::setPropertyValue( const OUString& rName, const uno::Any } void SAL_CALL DummyText::setPosition(const awt::Point& rPosition ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { DummyXShape::setPosition(rPosition); if(maTrans.hasValue()) @@ -908,7 +908,7 @@ DummyGroup2D::DummyGroup2D(const OUString& rName) } awt::Point SAL_CALL DummyGroup2D::getPosition() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits::max(); long nLeft = std::numeric_limits::max(); @@ -927,7 +927,7 @@ awt::Point SAL_CALL DummyGroup2D::getPosition() } awt::Size SAL_CALL DummyGroup2D::getSize() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits::max(); long nLeft = std::numeric_limits::max(); @@ -948,7 +948,7 @@ awt::Size SAL_CALL DummyGroup2D::getSize() } void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { for(std::vector::const_iterator itr = maShapes.begin(), itrEnd = maShapes.end(); itr != itrEnd; ++itr) @@ -960,7 +960,7 @@ void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) } void SAL_CALL DummyGroup2D::setSize( const awt::Size& ) - throw( beans::PropertyVetoException, uno::RuntimeException ) + throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { SAL_WARN("chart2.opengl", "set size on group shape"); } @@ -995,7 +995,7 @@ DummyChart* DummyChart::getRootShape() return uno::makeAny(uno::Reference(this)); uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { QUERY_INTERFACE( drawing::XShapes ); QUERY_INTERFACE( container::XIndexAccess ); @@ -1003,7 +1003,7 @@ uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) } uno::Any SAL_CALL DummyXShapes::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -1028,7 +1028,7 @@ void DummyXShapes::release() } void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { DummyXShape* pChild = dynamic_cast(xShape.get()); assert(pChild); @@ -1038,7 +1038,7 @@ 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) + throw(uno::RuntimeException, std::exception) { std::vector< uno::Reference >::iterator itr = std::find(maUNOShapes.begin(), maUNOShapes.end(), xShape); if(itr != maUNOShapes.end()) @@ -1053,26 +1053,26 @@ void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xSha } uno::Type SAL_CALL DummyXShapes::getElementType() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return ::getCppuType(( const uno::Reference< drawing::XShape >*)0); } sal_Bool SAL_CALL SAL_CALL DummyXShapes::hasElements() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return !maUNOShapes.empty(); } sal_Int32 SAL_CALL DummyXShapes::getCount() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return maUNOShapes.size(); } uno::Any SAL_CALL DummyXShapes::getByIndex(sal_Int32 nIndex) throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { uno::Any aShape; aShape <<= maUNOShapes[nIndex]; @@ -1499,7 +1499,7 @@ void DummyChart::createGLContext() } void SAL_CALL DummyChart::setPosition( const awt::Point& aPosition ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { DummyXShape::setPosition(aPosition); } @@ -1509,7 +1509,7 @@ DummyChart::~DummyChart() } void SAL_CALL DummyChart::setSize( const awt::Size& aSize ) - throw( beans::PropertyVetoException, uno::RuntimeException ) + 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 / OPENGL_SCALE_VALUE; diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx index c909d24cdfa2..30597f83f578 100644 --- a/chart2/source/view/main/Linear3DTransformation.cxx +++ b/chart2/source/view/main/Linear3DTransformation.cxx @@ -40,7 +40,7 @@ Linear3DTransformation::~Linear3DTransformation() Sequence< double > SAL_CALL Linear3DTransformation::transform( const Sequence< double >& rSourceValues ) throw (RuntimeException, - lang::IllegalArgumentException) + lang::IllegalArgumentException, std::exception) { double fX = rSourceValues[0]; double fY = rSourceValues[1]; @@ -82,13 +82,13 @@ Sequence< double > SAL_CALL Linear3DTransformation::transform( } sal_Int32 SAL_CALL Linear3DTransformation::getSourceDimension() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 3; } sal_Int32 SAL_CALL Linear3DTransformation::getTargetDimension() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 3; } diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx index 856509c2c878..e75e2a13b19d 100644 --- a/chart2/source/view/main/VPolarTransformation.cxx +++ b/chart2/source/view/main/VPolarTransformation.cxx @@ -44,7 +44,7 @@ VPolarTransformation::~VPolarTransformation() Sequence< double > SAL_CALL VPolarTransformation::transform( const Sequence< double >& rSourceValues ) throw (RuntimeException, - lang::IllegalArgumentException) + lang::IllegalArgumentException, std::exception) { double fScaledLogicAngle = rSourceValues[0]; double fScaledLogicRadius = rSourceValues[1]; @@ -67,13 +67,13 @@ Sequence< double > SAL_CALL VPolarTransformation::transform( } sal_Int32 SAL_CALL VPolarTransformation::getSourceDimension() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 3; } sal_Int32 SAL_CALL VPolarTransformation::getTargetDimension() - throw (RuntimeException) + throw (RuntimeException, std::exception) { return 3; } diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index f89db16f16ca..611ea04afce1 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -91,29 +91,29 @@ class testCollator : public cppu::WeakImplHelper1< 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) + const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException, std::exception) { 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) + const OUString& str2) throw(uno::RuntimeException, std::exception) { return str1.compareTo(str2); } virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32) - throw(uno::RuntimeException) {return 0;} + throw(uno::RuntimeException, std::exception) {return 0;} virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const OUString&, - const lang::Locale&, sal_Int32) throw(uno::RuntimeException) {return 0;} + const lang::Locale&, sal_Int32) throw(uno::RuntimeException, std::exception) {return 0;} virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const OUString&, - const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException) {} + const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException, std::exception) {} virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return uno::Sequence< OUString >(); } virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return uno::Sequence< sal_Int32 >(); } @@ -126,63 +126,63 @@ class testBreakIterator : public cppu::WeakImplHelper1< 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) {return -1;} + throw(uno::RuntimeException, std::exception) {return -1;} virtual sal_Int32 SAL_CALL previousCharacters( const OUString&, sal_Int32, const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) - throw(uno::RuntimeException) {return -1;} + throw(uno::RuntimeException, std::exception) {return -1;} virtual i18n::Boundary SAL_CALL previousWord( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16) throw(uno::RuntimeException) + const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) { return i18n::Boundary(); } virtual i18n::Boundary SAL_CALL nextWord( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16) throw(uno::RuntimeException) + const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) { return i18n::Boundary(); } virtual i18n::Boundary SAL_CALL getWordBoundary( const OUString&, sal_Int32, const lang::Locale&, sal_Int16, sal_Bool ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return i18n::Boundary(); } virtual sal_Bool SAL_CALL isBeginWord( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) + const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) { return false; } virtual sal_Bool SAL_CALL isEndWord( const OUString&, sal_Int32, - const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException) + const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException, std::exception) { return false; } virtual sal_Int16 SAL_CALL getWordType( const OUString&, sal_Int32, - const lang::Locale& ) throw(uno::RuntimeException) + const lang::Locale& ) throw(uno::RuntimeException, std::exception) { return 0; } virtual sal_Int32 SAL_CALL beginOfSentence( const OUString&, sal_Int32, - const lang::Locale& ) throw(uno::RuntimeException) + const lang::Locale& ) throw(uno::RuntimeException, std::exception) { return 0; } virtual sal_Int32 SAL_CALL endOfSentence( const OUString& rText, sal_Int32, - const lang::Locale& ) throw(uno::RuntimeException) + const lang::Locale& ) throw(uno::RuntimeException, std::exception) { 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) + throw(uno::RuntimeException, std::exception) { return i18n::LineBreakResults(); } virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 ) - throw(uno::RuntimeException) { return -1; } + throw(uno::RuntimeException, std::exception) { return -1; } virtual sal_Int32 SAL_CALL beginOfScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException) { return -1; } + sal_Int16 ) throw(uno::RuntimeException, std::exception) { return -1; } virtual sal_Int32 SAL_CALL endOfScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException) { return -1; } + sal_Int16 ) throw(uno::RuntimeException, std::exception) { return -1; } virtual sal_Int32 SAL_CALL previousScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException) { return -1; } + sal_Int16 ) throw(uno::RuntimeException, std::exception) { return -1; } virtual sal_Int32 SAL_CALL nextScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException) { return -1; } + sal_Int16 ) throw(uno::RuntimeException, std::exception) { return -1; } virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; } + const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) { return -1; } virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& rText, sal_Int32 nStartPos, - const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException) + const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) { const sal_Unicode *pStr = rText.getStr()+nStartPos; for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI) @@ -196,9 +196,9 @@ public: return -1; } virtual sal_Int32 SAL_CALL previousCharBlock( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; } + const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) { return -1; } virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& rText, sal_Int32 nStartPos, - const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException) + const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) { 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 28017292cfa0..fa1ec4e27ecc 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -50,7 +50,7 @@ public: 0 ); //??? } - virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) throw(RuntimeException); + virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) throw(RuntimeException, std::exception); }; class AnyCompareFactory : public cppu::WeakImplHelper3< XAnyCompareFactory, XInitialization, XServiceInfo > @@ -64,16 +64,16 @@ public: {} // XAnyCompareFactory - virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) throw(::com::sun::star::uno::RuntimeException); + virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) - throw ( Exception, RuntimeException ); + throw ( Exception, RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception); // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); @@ -81,7 +81,7 @@ public: static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& ); }; -sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw(::com::sun::star::uno::RuntimeException) +sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 aResult = 0; @@ -96,7 +96,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(::com::sun::star::uno::RuntimeException) +Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( const OUString& aPropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { // for now only OUString properties compare is implemented // so no check for the property name is done @@ -107,7 +107,7 @@ Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( con return Reference< XAnyCompare >(); } -void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) +void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) { if( aArguments.getLength() ) { @@ -119,7 +119,7 @@ void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) } } -OUString SAL_CALL AnyCompareFactory::getImplementationName( ) throw( RuntimeException ) +OUString SAL_CALL AnyCompareFactory::getImplementationName( ) throw( RuntimeException, std::exception ) { return getImplementationName_static(); } @@ -129,12 +129,12 @@ OUString SAL_CALL AnyCompareFactory::getImplementationName_static( ) return OUString( "AnyCompareFactory" ); } -sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& ServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index ee4bc6c457bb..a3c05f313e9b 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -41,33 +41,33 @@ public: // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XIndexReplace virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); @@ -89,7 +89,7 @@ IndexedPropertyValuesContainer::~IndexedPropertyValuesContainer() throw() // XIndexContainer void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nSize >= nIndex) && (nIndex >= 0)) @@ -131,7 +131,7 @@ void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, c void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nIndex < nSize) && (nIndex >= 0)) @@ -166,7 +166,7 @@ void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex ) // XIndexReplace void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nIndex < nSize) && (nIndex >= 0)) @@ -182,14 +182,14 @@ void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, // XIndexAccess sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return maProperties.size(); } ::com::sun::star::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if (!((nIndex < nSize) && (nIndex >= 0))) @@ -202,19 +202,19 @@ sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount( ) // XElementAccess ::com::sun::star::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::getCppuType((uno::Sequence *)0); } sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return !maProperties.empty(); } //XServiceInfo -OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return getImplementationName_static(); } @@ -224,12 +224,12 @@ OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName_static( return OUString( "IndexedPropertyValuesContainer" ); } -sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 9492944467e0..1f88267cccc8 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -42,35 +42,35 @@ public: // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); @@ -92,7 +92,7 @@ NamedPropertyValuesContainer::~NamedPropertyValuesContainer() throw() // XNameContainer void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { if( maProperties.find( aName ) != maProperties.end() ) throw container::ElementExistException(); @@ -106,7 +106,7 @@ void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( Name ); if( aIter == maProperties.end() ) @@ -118,7 +118,7 @@ void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); if( aIter == maProperties.end() ) @@ -134,7 +134,7 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName // XNameAccess ::com::sun::star::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); if( aIter == maProperties.end() ) @@ -148,7 +148,7 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName } ::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.begin(); const NamedPropertyValues::iterator aEnd = maProperties.end(); @@ -165,7 +165,7 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName } sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); return aIter != maProperties.end(); @@ -173,19 +173,19 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName // XElementAccess ::com::sun::star::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::getCppuType((uno::Sequence *)0); } sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements( ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return !maProperties.empty(); } //XServiceInfo -OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return getImplementationName_static(); } @@ -195,12 +195,12 @@ OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName_static( ) return OUString( "NamedPropertyValuesContainer" ); } -sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx index d8c416242d33..6c600b023927 100644 --- a/comphelper/source/container/containermultiplexer.cxx +++ b/comphelper/source/container/containermultiplexer.cxx @@ -142,7 +142,7 @@ namespace comphelper } - void SAL_CALL OContainerListenerAdapter::disposing( const EventObject& _rSource) throw(RuntimeException) + void SAL_CALL OContainerListenerAdapter::disposing( const EventObject& _rSource) throw(RuntimeException, std::exception) { if (m_pListener) { @@ -159,21 +159,21 @@ namespace comphelper } - void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException) + void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) { if (m_pListener && !locked()) m_pListener->_elementInserted(_rEvent); } - void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException) + void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) { if (m_pListener && !locked()) m_pListener->_elementRemoved(_rEvent); } - void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException) + void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) { if (m_pListener && !locked()) m_pListener->_elementReplaced(_rEvent); diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 40dc3f5f6dd8..2d9eaa972541 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -192,31 +192,31 @@ namespace comphelper virtual ~EnumerableMap(); // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException); + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception); // XEnumerableMap - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createKeyEnumeration( ::sal_Bool _Isolated ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createValueEnumeration( ::sal_Bool _Isolated ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createElementEnumeration( ::sal_Bool _Isolated ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createKeyEnumeration( ::sal_Bool _Isolated ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createValueEnumeration( ::sal_Bool _Isolated ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createElementEnumeration( ::sal_Bool _Isolated ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); // XMap - virtual Type SAL_CALL getKeyType() throw (RuntimeException); - virtual Type SAL_CALL getValueType() throw (RuntimeException); - virtual void SAL_CALL clear( ) throw (NoSupportException, RuntimeException); - virtual ::sal_Bool SAL_CALL containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException); - virtual ::sal_Bool SAL_CALL containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException); - virtual Any SAL_CALL get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException); - virtual Any SAL_CALL put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException); - virtual Any SAL_CALL remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException); + virtual Type SAL_CALL getKeyType() throw (RuntimeException, std::exception); + virtual Type SAL_CALL getValueType() throw (RuntimeException, std::exception); + virtual void SAL_CALL clear( ) throw (NoSupportException, RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception); + virtual Any SAL_CALL get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception); + virtual Any SAL_CALL put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception); + virtual Any SAL_CALL remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception); // XElementAccess (base of XMap) - virtual Type SAL_CALL getElementType() throw (RuntimeException); - virtual ::sal_Bool SAL_CALL hasElements() throw (RuntimeException); + virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception); public: // XServiceInfo, static version (used for component registration) @@ -318,8 +318,8 @@ namespace comphelper } // XEnumeration - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException); - virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException); + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException, std::exception); + virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception); protected: virtual ~MapEnumeration() @@ -360,7 +360,7 @@ namespace comphelper } - void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException) + void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this, ComponentMethodGuard::WithoutInit ); if ( impl_isInitialized_nothrow() ) @@ -539,42 +539,42 @@ namespace comphelper } - Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException) + Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, _Isolated ); } - Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException) + Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, _Isolated ); } - Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException) + Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( ::sal_Bool _Isolated ) throw (NoSupportException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eBoth, _Isolated ); } - Type SAL_CALL EnumerableMap::getKeyType() throw (RuntimeException) + Type SAL_CALL EnumerableMap::getKeyType() throw (RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); return m_aData.m_aKeyType; } - Type SAL_CALL EnumerableMap::getValueType() throw (RuntimeException) + Type SAL_CALL EnumerableMap::getValueType() throw (RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); return m_aData.m_aValueType; } - void SAL_CALL EnumerableMap::clear( ) throw (NoSupportException, RuntimeException) + void SAL_CALL EnumerableMap::clear( ) throw (NoSupportException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); impl_checkMutable_throw(); @@ -585,7 +585,7 @@ namespace comphelper } - ::sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException) + ::sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); impl_checkKey_throw( _key ); @@ -595,7 +595,7 @@ namespace comphelper } - ::sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException) + ::sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); impl_checkValue_throw( _value ); @@ -612,7 +612,7 @@ namespace comphelper } - Any SAL_CALL EnumerableMap::get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException) + Any SAL_CALL EnumerableMap::get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); impl_checkKey_throw( _key ); @@ -625,7 +625,7 @@ namespace comphelper } - Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException) + Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); impl_checkMutable_throw(); @@ -651,7 +651,7 @@ namespace comphelper } - Any SAL_CALL EnumerableMap::remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException) + Any SAL_CALL EnumerableMap::remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); impl_checkMutable_throw(); @@ -672,31 +672,31 @@ namespace comphelper } - Type SAL_CALL EnumerableMap::getElementType() throw (RuntimeException) + Type SAL_CALL EnumerableMap::getElementType() throw (RuntimeException, std::exception) { return ::cppu::UnoType< Pair< Any, Any > >::get(); } - ::sal_Bool SAL_CALL EnumerableMap::hasElements() throw (RuntimeException) + ::sal_Bool SAL_CALL EnumerableMap::hasElements() throw (RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); return m_aData.m_pValues->empty(); } - OUString SAL_CALL EnumerableMap::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL EnumerableMap::getImplementationName( ) throw (RuntimeException, std::exception) { return getImplementationName_static(); } - ::sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, _serviceName); } - Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -761,14 +761,14 @@ namespace comphelper //= MapEnumeration - implementation //==================================================================== - ::sal_Bool SAL_CALL MapEnumeration::hasMoreElements( ) throw (RuntimeException) + ::sal_Bool SAL_CALL MapEnumeration::hasMoreElements( ) throw (RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); return m_aEnumerator.hasMoreElements(); } - Any SAL_CALL MapEnumeration::nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL MapEnumeration::nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { ComponentMethodGuard aGuard( *this ); return m_aEnumerator.nextElement(); diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index 3eb7a0dc245b..07cb797e7238 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -56,7 +56,7 @@ OEnumerationByName::~OEnumerationByName() } -sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(staruno::RuntimeException) +sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(staruno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -74,7 +74,7 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(staruno::Runtime staruno::Any SAL_CALL OEnumerationByName::nextElement( ) - throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException) + throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -96,7 +96,7 @@ staruno::Any SAL_CALL OEnumerationByName::nextElement( ) void SAL_CALL OEnumerationByName::disposing(const starlang::EventObject& aEvent) - throw(staruno::RuntimeException) + throw(staruno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -159,7 +159,7 @@ OEnumerationByIndex::~OEnumerationByIndex() } -sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(staruno::RuntimeException) +sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(staruno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -177,7 +177,7 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(staruno::Runtim staruno::Any SAL_CALL OEnumerationByIndex::nextElement( ) - throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException) + throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -199,7 +199,7 @@ staruno::Any SAL_CALL OEnumerationByIndex::nextElement( ) void SAL_CALL OEnumerationByIndex::disposing(const starlang::EventObject& aEvent) - throw(staruno::RuntimeException) + throw(staruno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -260,7 +260,7 @@ OAnyEnumeration::~OAnyEnumeration() } -sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(staruno::RuntimeException) +sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(staruno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -269,7 +269,7 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(staruno::RuntimeExc staruno::Any SAL_CALL OAnyEnumeration::nextElement( ) - throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException) + throw(starcontainer::NoSuchElementException, starlang::WrappedTargetException, staruno::RuntimeException, std::exception) { if ( ! hasMoreElements()) throw starcontainer::NoSuchElementException(); diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index c94db66bb5ae..caa55c549ead 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -46,30 +46,30 @@ namespace comphelper // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess virtual sal_Bool SAL_CALL hasElements( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); private: SvGenericNameContainerMapImpl maProperties; @@ -97,7 +97,7 @@ NameContainer::~NameContainer() // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, - WrappedTargetException, RuntimeException) + WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -112,7 +112,7 @@ void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aEl void SAL_CALL NameContainer::removeByName( const OUString& Name ) throw(NoSuchElementException, WrappedTargetException, - RuntimeException) + RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -127,7 +127,7 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name ) void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, - WrappedTargetException, RuntimeException) + WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -145,7 +145,7 @@ void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aE Any SAL_CALL NameContainer::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, - RuntimeException) + RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -157,7 +157,7 @@ Any SAL_CALL NameContainer::getByName( const OUString& aName ) } Sequence< OUString > SAL_CALL NameContainer::getElementNames( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -176,7 +176,7 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames( ) } sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -185,7 +185,7 @@ sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName ) } sal_Bool SAL_CALL NameContainer::hasElements( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -193,7 +193,7 @@ sal_Bool SAL_CALL NameContainer::hasElements( ) } Type SAL_CALL NameContainer::getElementType() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return maType; } diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index c6d531fbdddf..ece585f4603f 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -102,32 +102,32 @@ public: // Methods of XEventAttacherManager virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); virtual void SAL_CALL registerScriptEvents(sal_Int32 Index, const Sequence< ScriptEventDescriptor >& ScriptEvents) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); virtual void SAL_CALL revokeScriptEvent(sal_Int32 Index, const OUString& ListenerType, const OUString& EventMethod, const OUString& removeListenerParam) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); virtual void SAL_CALL revokeScriptEvents(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); virtual void SAL_CALL insertEntry(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); virtual void SAL_CALL removeEntry(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); virtual Sequence< ScriptEventDescriptor > SAL_CALL getScriptEvents(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); virtual void SAL_CALL attach(sal_Int32 Index, const Reference< XInterface >& Object, const Any& Helper) - throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException ); + throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception ); virtual void SAL_CALL detach(sal_Int32 nIndex, const Reference< XInterface >& xObject) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); virtual void SAL_CALL addScriptListener(const Reference< XScriptListener >& aListener) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); virtual void SAL_CALL removeScriptListener(const Reference< XScriptListener >& Listener) - throw( IllegalArgumentException, RuntimeException ); + throw( IllegalArgumentException, RuntimeException, std::exception ); // Methods of XPersistObject - virtual OUString SAL_CALL getServiceName(void) throw( RuntimeException ); - virtual void SAL_CALL write(const Reference< XObjectOutputStream >& OutStream) throw( IOException, RuntimeException ); - virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) throw( IOException, RuntimeException ); + virtual OUString SAL_CALL getServiceName(void) throw( RuntimeException, std::exception ); + virtual void SAL_CALL write(const Reference< XObjectOutputStream >& OutStream) throw( IOException, RuntimeException, std::exception ); + virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) throw( IOException, RuntimeException, std::exception ); private: Reference< XIdlReflection > getReflection() throw( Exception ); @@ -162,11 +162,11 @@ public: const OUString & rScriptCode_ ); // Methods of XAllListener - virtual void SAL_CALL firing(const AllEventObject& Event) throw( RuntimeException ); - virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw( InvocationTargetException, RuntimeException ); + virtual void SAL_CALL firing(const AllEventObject& Event) throw( RuntimeException, std::exception ); + virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw( InvocationTargetException, RuntimeException, std::exception ); // Methods of XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException ); + virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException, std::exception ); }; //======================================================================== @@ -187,7 +187,7 @@ AttacherAllListener_Impl::AttacherAllListener_Impl //======================================================================== // Methods of XAllListener void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { ScriptEvent aScriptEvent; aScriptEvent.Source = (OWeakObject *)mpManager; // get correct XInterface @@ -253,7 +253,7 @@ void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rR //======================================================================== // Methods of XAllListener Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Event ) - throw( InvocationTargetException, RuntimeException ) + throw( InvocationTargetException, RuntimeException, std::exception ) { ScriptEvent aScriptEvent; aScriptEvent.Source = (OWeakObject *)mpManager; // get correct XInterface @@ -341,7 +341,7 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even //======================================================================== // Methods of XEventListener void SAL_CALL AttacherAllListener_Impl::disposing(const EventObject& ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // It is up to the container to release the object } @@ -455,7 +455,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvent sal_Int32 nIndex, const ScriptEventDescriptor& ScriptEvent ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); @@ -502,7 +502,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& ScriptEvents ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); @@ -528,7 +528,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent const OUString& EventMethod, const OUString& ToRemoveListenerParam ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); @@ -561,7 +561,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); ::std::deque::iterator aIt = implCheckIndex( nIndex ); @@ -574,7 +574,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex ) void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); if( nIndex < 0 ) @@ -589,7 +589,7 @@ void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex) void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); ::std::deque::iterator aIt = implCheckIndex( nIndex ); @@ -601,7 +601,7 @@ void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex) Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEvents(sal_Int32 nIndex) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); ::std::deque::iterator aIt = implCheckIndex( nIndex ); @@ -622,7 +622,7 @@ 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 ) + throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); if( nIndex < 0 || !xObject.is() ) @@ -685,7 +685,7 @@ 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 ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); //return; @@ -728,14 +728,14 @@ void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference } void SAL_CALL ImplEventAttacherManager::addScriptListener(const Reference< XScriptListener >& aListener) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); aScriptListeners.addInterface( aListener ); } void SAL_CALL ImplEventAttacherManager::removeScriptListener(const Reference< XScriptListener >& aListener) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); aScriptListeners.removeInterface( aListener ); @@ -744,13 +744,13 @@ void SAL_CALL ImplEventAttacherManager::removeScriptListener(const Reference< XS // Methods of XPersistObject OUString SAL_CALL ImplEventAttacherManager::getServiceName(void) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.uno.script.EventAttacherManager" ); } void SAL_CALL ImplEventAttacherManager::write(const Reference< XObjectOutputStream >& OutStream) - throw( IOException, RuntimeException ) + throw( IOException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); // Don't run without XMarkableStream @@ -799,7 +799,7 @@ void SAL_CALL ImplEventAttacherManager::write(const Reference< XObjectOutputStre } void SAL_CALL ImplEventAttacherManager::read(const Reference< XObjectInputStream >& InStream) - throw( IOException, RuntimeException ) + 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 335cbf97d42a..20ad358ea80d 100644 --- a/comphelper/source/misc/SelectionMultiplex.cxx +++ b/comphelper/source/misc/SelectionMultiplex.cxx @@ -123,7 +123,7 @@ void OSelectionChangeMultiplexer::dispose() // XEventListener -void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException) +void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException, std::exception) { if (m_pListener) { @@ -144,7 +144,7 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSour // XSelectionChangeListener -void SAL_CALL OSelectionChangeMultiplexer::selectionChanged( const EventObject& _rEvent ) throw( RuntimeException) +void SAL_CALL OSelectionChangeMultiplexer::selectionChanged( const EventObject& _rEvent ) throw( RuntimeException, std::exception) { if (m_pListener && !locked()) m_pListener->_selectionChanged(_rEvent); diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 6774302b5afc..631670849042 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -112,31 +112,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) + sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::containsPoint( _rPoint ); } - Point SAL_CALL OAccessibleComponentHelper::getLocation( ) throw (RuntimeException) + Point SAL_CALL OAccessibleComponentHelper::getLocation( ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::getLocation( ); } - Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen( ) throw (RuntimeException) + Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen( ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::getLocationOnScreen( ); } - Size SAL_CALL OAccessibleComponentHelper::getSize( ) throw (RuntimeException) + Size SAL_CALL OAccessibleComponentHelper::getSize( ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::getSize( ); } - Rectangle SAL_CALL OAccessibleComponentHelper::getBounds( ) throw (RuntimeException) + Rectangle SAL_CALL OAccessibleComponentHelper::getBounds( ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::getBounds( ); } @@ -156,31 +156,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) + sal_Bool SAL_CALL OAccessibleExtendedComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::containsPoint( _rPoint ); } - Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation( ) throw (RuntimeException) + Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation( ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::getLocation( ); } - Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen( ) throw (RuntimeException) + Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen( ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::getLocationOnScreen( ); } - Size SAL_CALL OAccessibleExtendedComponentHelper::getSize( ) throw (RuntimeException) + Size SAL_CALL OAccessibleExtendedComponentHelper::getSize( ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::getSize( ); } - Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds( ) throw (RuntimeException) + Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds( ) throw (RuntimeException, std::exception) { return OCommonAccessibleComponent::getBounds( ); } diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index d94cd43e1f51..009853485a19 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -128,7 +128,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException) + void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) { OMutexGuard aGuard( getExternalLock() ); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -151,7 +151,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException) + void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) { OMutexGuard aGuard( getExternalLock() ); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -232,7 +232,7 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent( ) throw (RuntimeException) + sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -278,7 +278,7 @@ namespace comphelper } - Locale SAL_CALL OAccessibleContextHelper::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) + Locale SAL_CALL OAccessibleContextHelper::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { // simply ask the parent Reference< XAccessible > xParent = getAccessibleParent(); diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx index 4aadb00f709c..0455108a2700 100644 --- a/comphelper/source/misc/accessiblekeybindinghelper.cxx +++ b/comphelper/source/misc/accessiblekeybindinghelper.cxx @@ -76,7 +76,7 @@ namespace comphelper // XAccessibleKeyBinding - sal_Int32 OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount() throw (RuntimeException) + sal_Int32 OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -85,7 +85,7 @@ namespace comphelper - Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index 7ddb80605bab..41b5c7727040 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.cxx @@ -125,49 +125,49 @@ namespace comphelper } - void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::selectAccessibleChild( nChildIndex ); } - sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); return( OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ) ); } - void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection( ) throw (RuntimeException) + void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::clearAccessibleSelection(); } - void SAL_CALL OAccessibleSelectionHelper::selectAllAccessibleChildren( ) throw (RuntimeException) + void SAL_CALL OAccessibleSelectionHelper::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::selectAllAccessibleChildren(); } - sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); return( OCommonAccessibleSelection::getSelectedAccessibleChildCount() ); } - Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); return( OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ) ); } - void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::deselectAccessibleChild( nSelectedChildIndex ); diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index 00a21a7fa1d0..51a6ef8435d6 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -793,7 +793,7 @@ namespace comphelper // XAccessibleText - sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -802,7 +802,7 @@ namespace comphelper - sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException) + sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -811,7 +811,7 @@ namespace comphelper - OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException) + OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -820,7 +820,7 @@ namespace comphelper - sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException) + sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -829,7 +829,7 @@ namespace comphelper - sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException) + sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -838,7 +838,7 @@ namespace comphelper - OUString OAccessibleTextHelper::getText() throw (RuntimeException) + OUString OAccessibleTextHelper::getText() throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -847,7 +847,7 @@ namespace comphelper - OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -856,7 +856,7 @@ namespace comphelper - TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -865,7 +865,7 @@ namespace comphelper - TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -874,7 +874,7 @@ namespace comphelper - TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 47e33392701f..3c37394165db 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -259,7 +259,7 @@ namespace comphelper } - void SAL_CALL OWrappedAccessibleChildrenManager::disposing( const EventObject& _rSource ) throw (RuntimeException) + void SAL_CALL OWrappedAccessibleChildrenManager::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { // this should come from one of the inner XAccessible's of our children Reference< XAccessible > xSource( _rSource.Source, UNO_QUERY ); @@ -323,7 +323,7 @@ namespace comphelper IMPLEMENT_FORWARD_REFCOUNT( OAccessibleWrapper, OComponentProxyAggregation ) - Any OAccessibleWrapper::queryInterface( const Type& _rType ) throw (RuntimeException) + Any OAccessibleWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { // #111089# instead of the inner XAccessible the proxy XAccessible must be returned Any aReturn = OAccessibleWrapper_Base::queryInterface( _rType ); @@ -346,7 +346,7 @@ namespace comphelper } - Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext( ) throw (RuntimeException) + Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext( ) throw (RuntimeException, std::exception) { // see if the context is still alive (we cache it) Reference< XAccessibleContext > xContext = (Reference< XAccessibleContext >)m_aContext; @@ -421,7 +421,7 @@ namespace comphelper } - Any SAL_CALL OAccessibleContextWrapperHelper::queryInterface( const Type& _rType ) throw (RuntimeException) + Any SAL_CALL OAccessibleContextWrapperHelper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = OComponentProxyAggregationHelper::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -433,13 +433,13 @@ namespace comphelper IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleContextWrapperHelper, OComponentProxyAggregationHelper, OAccessibleContextWrapperHelper_Base ) - sal_Int32 SAL_CALL OAccessibleContextWrapperHelper::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL OAccessibleContextWrapperHelper::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { return m_xInnerContext->getAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL OAccessibleContextWrapperHelper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL OAccessibleContextWrapperHelper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { // get the child of the wrapped component Reference< XAccessible > xInnerChild = m_xInnerContext->getAccessibleChild( i ); @@ -447,7 +447,7 @@ namespace comphelper } - Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapperHelper::getAccessibleRelationSet( ) throw (RuntimeException) + Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapperHelper::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { return m_xInnerContext->getAccessibleRelationSet(); // TODO: if this relation set would contain relations to siblings, we would normally need @@ -455,7 +455,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapperHelper::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException) + void SAL_CALL OAccessibleContextWrapperHelper::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException, std::exception) { #if OSL_DEBUG_LEVEL > 0 if ( AccessibleEventId::STATE_CHANGED == _rEvent.EventId ) @@ -493,7 +493,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapperHelper::dispose() throw( RuntimeException ) + void SAL_CALL OAccessibleContextWrapperHelper::dispose() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rBHelper.rMutex ); @@ -511,7 +511,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapperHelper::disposing( const EventObject& _rEvent ) throw (RuntimeException) + void SAL_CALL OAccessibleContextWrapperHelper::disposing( const EventObject& _rEvent ) throw (RuntimeException, std::exception) { // simply disambiguate this OComponentProxyAggregationHelper::disposing( _rEvent ); @@ -543,61 +543,61 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { return OAccessibleContextWrapperHelper::getAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { return OAccessibleContextWrapperHelper::getAccessibleChild( i ); } - Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleParent( ) throw (RuntimeException) + Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleParent( ) throw (RuntimeException, std::exception) { return m_xParentAccessible; } - sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent( ) throw (RuntimeException) + sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) { return m_xInnerContext->getAccessibleIndexInParent(); } - sal_Int16 SAL_CALL OAccessibleContextWrapper::getAccessibleRole( ) throw (RuntimeException) + sal_Int16 SAL_CALL OAccessibleContextWrapper::getAccessibleRole( ) throw (RuntimeException, std::exception) { return m_xInnerContext->getAccessibleRole(); } - OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) throw (RuntimeException, std::exception) { return m_xInnerContext->getAccessibleDescription(); } - OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) throw (RuntimeException, std::exception) { return m_xInnerContext->getAccessibleName(); } - Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet( ) throw (RuntimeException) + Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { return OAccessibleContextWrapperHelper::getAccessibleRelationSet(); } - Reference< XAccessibleStateSet > SAL_CALL OAccessibleContextWrapper::getAccessibleStateSet( ) throw (RuntimeException) + Reference< XAccessibleStateSet > SAL_CALL OAccessibleContextWrapper::getAccessibleStateSet( ) throw (RuntimeException, std::exception) { return m_xInnerContext->getAccessibleStateSet(); } - Locale SAL_CALL OAccessibleContextWrapper::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) + Locale SAL_CALL OAccessibleContextWrapper::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { return m_xInnerContext->getLocale(); } @@ -610,7 +610,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException) + void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_nNotifierClient ) @@ -619,7 +619,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException) + void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_nNotifierClient ) @@ -660,7 +660,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapper::dispose() throw( RuntimeException ) + void SAL_CALL OAccessibleContextWrapper::dispose() throw( RuntimeException, std::exception ) { // simply disambiguate WeakComponentImplHelperBase::dispose(); diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index c910f43e1e10..f852950ca728 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -106,7 +106,7 @@ namespace comphelper } - sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw (RuntimeException) + sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw (RuntimeException, std::exception) { sal_Int64 nReturn( 0 ); diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index eb833fe74ce2..d340d6e08080 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -53,7 +53,7 @@ public: inline bool isSelected() const { return mbSelected; } inline void reset() { mbSelected = false; } - virtual void SAL_CALL select() throw( RuntimeException ) { mbSelected = true; } + virtual void SAL_CALL select() throw( RuntimeException, std::exception ) { mbSelected = true; } private: bool mbSelected; @@ -69,16 +69,16 @@ public: inline bool isSelected() const { return mbSelected; } inline void reset() { mbSelected = false; } - virtual void SAL_CALL select() throw( RuntimeException ) { mbSelected = true; } + virtual void SAL_CALL select() throw( RuntimeException, std::exception ) { mbSelected = true; } - virtual void SAL_CALL setPassword( const OUString& rPass ) throw( RuntimeException ) { maPassword = rPass; } - virtual OUString SAL_CALL getPassword() throw( RuntimeException ) { return maPassword; } + virtual void SAL_CALL setPassword( const OUString& rPass ) throw( RuntimeException, std::exception ) { maPassword = rPass; } + virtual OUString SAL_CALL getPassword() throw( RuntimeException, std::exception ) { return maPassword; } - virtual void SAL_CALL setPasswordToModify( const OUString& rPass ) throw( RuntimeException ) { maModifyPassword = rPass; } - virtual OUString SAL_CALL getPasswordToModify() throw( RuntimeException ) { return maModifyPassword; } + virtual void SAL_CALL setPasswordToModify( const OUString& rPass ) throw( RuntimeException, std::exception ) { maModifyPassword = rPass; } + virtual OUString SAL_CALL getPasswordToModify() throw( RuntimeException, std::exception ) { return maModifyPassword; } - virtual void SAL_CALL setRecommendReadOnly( sal_Bool bReadOnly ) throw( RuntimeException ) { mbReadOnly = bReadOnly; } - virtual sal_Bool SAL_CALL getRecommendReadOnly() throw( RuntimeException ) { return mbReadOnly; } + virtual void SAL_CALL setRecommendReadOnly( sal_Bool bReadOnly ) throw( RuntimeException, std::exception ) { mbReadOnly = bReadOnly; } + virtual sal_Bool SAL_CALL getRecommendReadOnly() throw( RuntimeException, std::exception ) { return mbReadOnly; } private: OUString maPassword; @@ -116,12 +116,12 @@ OUString SimplePasswordRequest::getPassword() const return mpPassword->getPassword(); } -Any SAL_CALL SimplePasswordRequest::getRequest() throw( RuntimeException ) +Any SAL_CALL SimplePasswordRequest::getRequest() throw( RuntimeException, std::exception ) { return maRequest; } -Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest::getContinuations() throw( RuntimeException ) +Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest::getContinuations() throw( RuntimeException, std::exception ) { return maContinuations; } @@ -182,12 +182,12 @@ bool DocPasswordRequest::getRecommendReadOnly() const return mpPassword->getRecommendReadOnly(); } -Any SAL_CALL DocPasswordRequest::getRequest() throw( RuntimeException ) +Any SAL_CALL DocPasswordRequest::getRequest() throw( RuntimeException, std::exception ) { return maRequest; } -Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations() throw( RuntimeException ) +Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations() throw( RuntimeException, std::exception ) { return maContinuations; } diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index f9a97f064504..b69e0ddb864d 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.cxx @@ -79,7 +79,7 @@ uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( SAL_UNUSED_PA // XSimpleLogRing -void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::RuntimeException) +void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -95,7 +95,7 @@ void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno:: } -uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -114,7 +114,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) +void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) @@ -139,17 +139,17 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu } // XServiceInfo -OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException, std::exception) { return getImplementationName_static(); } -::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } -uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 30cf4ebf3412..ddaab2e6b2c4 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -60,16 +60,16 @@ public: Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XSimpleLogRing - virtual void SAL_CALL logString( const OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL logString( const OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx index 0afdf450c378..6757ed4685a9 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 ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) + void SAL_CALL OEventListenerHelper::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> xRef = m_xListener; if(xRef.is()) diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx index 223d46893861..d6af85a075df 100644 --- a/comphelper/source/misc/ihwrapnofilter.cxx +++ b/comphelper/source/misc/ihwrapnofilter.cxx @@ -56,7 +56,7 @@ namespace comphelper // XInteractionHandler void SAL_CALL OIHWrapNoFilterDialog::handle( const uno::Reference< task::XInteractionRequest >& xRequest) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { if( !m_xInter.is() ) return; @@ -73,7 +73,7 @@ namespace comphelper // XInteractionHandler2 sal_Bool SAL_CALL OIHWrapNoFilterDialog::handleInteractionRequest( const uno::Reference< task::XInteractionRequest >& xRequest) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { if( !m_xInter.is() ) return sal_False; @@ -101,19 +101,19 @@ namespace comphelper // XServiceInfo OUString SAL_CALL OIHWrapNoFilterDialog::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return impl_staticGetImplementationName(); } ::sal_Bool SAL_CALL OIHWrapNoFilterDialog::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OIHWrapNoFilterDialog::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return impl_staticGetSupportedServiceNames(); } diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index 4563ac21f2f4..93bbbec7277d 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -71,7 +71,7 @@ OInstanceLocker::~OInstanceLocker() // XComponent void SAL_CALL OInstanceLocker::dispose() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -97,7 +97,7 @@ void SAL_CALL OInstanceLocker::dispose() void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) @@ -111,7 +111,7 @@ void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEv void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pListenersContainer ) @@ -121,7 +121,7 @@ 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) + throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) @@ -190,19 +190,19 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg // XServiceInfo OUString SAL_CALL OInstanceLocker::getImplementationName( ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getImplementationName_static(); } ::sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -295,7 +295,7 @@ void OLockListener::Dispose() // XEventListener void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -320,7 +320,7 @@ 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) + 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 ); @@ -350,7 +350,7 @@ void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -381,7 +381,7 @@ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent ) // XTerminateListener void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent ) - throw (frame::TerminationVetoException, uno::RuntimeException) + throw (frame::TerminationVetoException, uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); if ( aEvent.Source == m_xInstance && ( m_nMode & embed::Actions::PREVENT_TERMINATION ) ) @@ -410,7 +410,7 @@ void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent ) void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent ) - throw (uno::RuntimeException) + 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 83153f793f53..1c1fe089b9ca 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -68,17 +68,17 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; @@ -109,15 +109,15 @@ public: void Dispose(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XCloseListener - virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index 30d7bdb33cd3..3263b0667312 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.cxx @@ -32,13 +32,13 @@ namespace comphelper //= OInteractionPassword //========================================================================= - void SAL_CALL OInteractionPassword::setPassword( const OUString& _Password ) throw (RuntimeException) + void SAL_CALL OInteractionPassword::setPassword( const OUString& _Password ) throw (RuntimeException, std::exception) { m_sPassword = _Password; } - OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException) + OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException, std::exception) { return m_sPassword; } @@ -65,13 +65,13 @@ namespace comphelper } - Any SAL_CALL OInteractionRequest::getRequest( ) throw(RuntimeException) + Any SAL_CALL OInteractionRequest::getRequest( ) throw(RuntimeException, std::exception) { return m_aRequest; } - Sequence< Reference< XInteractionContinuation > > SAL_CALL OInteractionRequest::getContinuations( ) throw(RuntimeException) + Sequence< Reference< XInteractionContinuation > > SAL_CALL OInteractionRequest::getContinuations( ) throw(RuntimeException, std::exception) { return m_aContinuations; } diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index 5044539c3cdd..82181a02ff78 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -66,7 +66,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -103,7 +103,7 @@ void NumberedCollection::setUntitledPrefix(const OUString& sPrefix) void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException ) + css::uno::RuntimeException, std::exception ) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -142,7 +142,7 @@ 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 ) + css::uno::RuntimeException, std::exception ) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -165,7 +165,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe OUString SAL_CALL NumberedCollection::getUntitledPrefix() - throw (css::uno::RuntimeException) + 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 7a02e234f81d..33a2a6526d5e 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -67,7 +67,7 @@ uno::Reference< uno::XInterface > SAL_CALL OOfficeRestartManager::Create( const // XRestartManager void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task::XInteractionHandler >& /* xInteractionHandler */ ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { if ( !m_xContext.is() ) throw uno::RuntimeException(); @@ -109,7 +109,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: ::sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( ::sal_Bool bOfficeInitialized ) - throw (uno::Exception, uno::RuntimeException) + throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -122,7 +122,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: // XCallback void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { try { @@ -164,17 +164,17 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) // XServiceInfo -OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException, std::exception) { return getImplementationName_static(); } -::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, aServiceName); } -uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index d7cae3dafec4..8cd79937d1be 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -64,16 +64,16 @@ public: Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // XRestartManager - virtual void SAL_CALL requestRestart( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInteractionHandler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isRestartRequested( ::sal_Bool bInitialized ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL requestRestart( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xInteractionHandler ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isRestartRequested( ::sal_Bool bInitialized ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XCallback - virtual void SAL_CALL notify( const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL notify( const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index 3764ef1a38e2..92498c8eaa0e 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -130,7 +130,7 @@ namespace comphelper } - Any SAL_CALL OComponentProxyAggregationHelper::queryInterface( const Type& _rType ) throw (RuntimeException) + Any SAL_CALL OComponentProxyAggregationHelper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn( BASE::queryInterface( _rType ) ); if ( !aReturn.hasValue() ) @@ -157,7 +157,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException) + void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { if ( _rSource.Source == m_xInner ) { // it's our inner context which is dying -> dispose ourself @@ -169,7 +169,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregationHelper::dispose() throw( RuntimeException ) + void SAL_CALL OComponentProxyAggregationHelper::dispose() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_rBHelper.rMutex ); @@ -212,7 +212,7 @@ namespace comphelper IMPLEMENT_GET_IMPLEMENTATION_ID( OComponentProxyAggregation ) - Sequence< Type > SAL_CALL OComponentProxyAggregation::getTypes( ) throw (RuntimeException) + Sequence< Type > SAL_CALL OComponentProxyAggregation::getTypes( ) throw (RuntimeException, std::exception) { Sequence< Type > aTypes( OComponentProxyAggregationHelper::getTypes() ); @@ -235,7 +235,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) throw (RuntimeException) + void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { // Simply disambiguate---this is necessary for MSVC to distinguish // "disposing(EventObject)" from "disposing()"; but it is also a good @@ -253,7 +253,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregation::dispose() throw( RuntimeException ) + void SAL_CALL OComponentProxyAggregation::dispose() throw( RuntimeException, std::exception ) { // simply disambiguate WeakComponentImplHelperBase::dispose(); diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 18dd1432e9a7..05c0aa4c7e83 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -43,11 +43,11 @@ public: // XServiceInfo: virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( OUString const& name ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual uno::Sequence SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); // XSingleComponentFactory: virtual uno::Reference SAL_CALL createInstanceWithContext( uno::Reference const& xContext ) @@ -70,19 +70,19 @@ ServiceDecl::Factory::~Factory() // XServiceInfo: OUString ServiceDecl::Factory::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_rServiceDecl.getImplementationName(); } sal_Bool ServiceDecl::Factory::supportsService( OUString const& name ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_rServiceDecl.supportsService(name); } uno::Sequence ServiceDecl::Factory::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return m_rServiceDecl.getSupportedServiceNames(); } diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 7395aa676dea..bdf6cd2bc817 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -27,13 +27,13 @@ namespace comphelper { /** returns an empty UString(). most times sufficient */ -OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString(); } /** the base implementation has no supported services */ -::com::sun::star::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Sequence< OUString> aSeq(0); return aSeq; diff --git a/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx index f3117e6566f9..a6b8f4310ba2 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) +Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (RuntimeException, std::exception) { 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) +Sequence< Type > SAL_CALL OWeakTypeObject::getTypes( ) throw (RuntimeException, std::exception) { return Sequence< Type >(); } -Sequence< ::sal_Int8 > SAL_CALL OWeakTypeObject::getImplementationId( ) throw (RuntimeException) +Sequence< ::sal_Int8 > SAL_CALL OWeakTypeObject::getImplementationId( ) throw (RuntimeException, std::exception) { return Sequence< ::sal_Int8 >(); } diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index d4867693fd13..4e7bc4f3c43c 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -115,7 +115,7 @@ OfficeInstallationDirectories::~OfficeInstallationDirectories() // virtual OUString SAL_CALL OfficeInstallationDirectories::getOfficeInstallationDirectoryURL() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { initDirs(); return OUString( *m_pOfficeBrandDir ); @@ -125,7 +125,7 @@ OfficeInstallationDirectories::getOfficeInstallationDirectoryURL() // virtual OUString SAL_CALL OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { initDirs(); return OUString( *m_pUserDir ); @@ -136,7 +136,7 @@ OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() // virtual OUString SAL_CALL OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if ( !URL.isEmpty() ) { @@ -172,7 +172,7 @@ OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) // virtual OUString SAL_CALL OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if ( !URL.isEmpty() ) { @@ -210,7 +210,7 @@ OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) // virtual OUString SAL_CALL OfficeInstallationDirectories::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return getImplementationName_static(); } @@ -218,7 +218,7 @@ OfficeInstallationDirectories::getImplementationName() // virtual sal_Bool SAL_CALL OfficeInstallationDirectories::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -226,7 +226,7 @@ OfficeInstallationDirectories::supportsService( const OUString& ServiceName ) // virtual uno::Sequence< OUString > SAL_CALL OfficeInstallationDirectories::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index 22517fa0e1ab..d631f1f0d54e 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -51,27 +51,27 @@ public: // XOfficeInstallationDirectories virtual OUString SAL_CALL getOfficeInstallationDirectoryURL() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getOfficeUserDataDirectoryURL() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL makeRelocatableURL( const OUString& URL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL makeAbsoluteURL( const OUString& URL ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index c4cc545d63a6..3448ae4943a4 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -46,13 +46,13 @@ ChainablePropertySet::~ChainablePropertySet() // XPropertySet Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mxInfo; } void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -70,7 +70,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyN } Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -91,32 +91,32 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyNa } void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } // XMultiPropertySet void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) - throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -150,7 +150,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< OUString } Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -184,26 +184,26 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence } void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } // XPropertyState PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& PropertyName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find( PropertyName ); if( aIter == mpInfo->maMap.end()) @@ -219,7 +219,7 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& P } Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -245,7 +245,7 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons } void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -255,7 +255,7 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPrope } Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx index c30df8aea05f..23a8ae272c71 100644 --- a/comphelper/source/property/ChainablePropertySetInfo.cxx +++ b/comphelper/source/property/ChainablePropertySetInfo.cxx @@ -55,7 +55,7 @@ void ChainablePropertySetInfo::remove( const OUString& aName ) } Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -77,7 +77,7 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() } Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { PropertyInfoHash::iterator aIter = maMap.find( rName ); @@ -94,7 +94,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& r } sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::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 3e2f2ca7a11b..e6b0e6ed7179 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -89,7 +89,7 @@ MasterPropertySet::~MasterPropertySet() // XPropertySet Reference< XPropertySetInfo > SAL_CALL MasterPropertySet::getPropertySetInfo( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mxInfo; } @@ -102,7 +102,7 @@ void MasterPropertySet::registerSlave ( ChainablePropertySet *pNewSet ) } void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -136,7 +136,7 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName } Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -172,32 +172,32 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName } void SAL_CALL MasterPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + 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) + throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -263,7 +263,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& } Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). boost::scoped_ptr< osl::Guard< comphelper::SolarMutex > > pMutexGuard; @@ -329,26 +329,26 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O } void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // todo } // XPropertyState PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& PropertyName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find( PropertyName ); if( aIter == mpInfo->maMap.end()) @@ -380,7 +380,7 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& Prop } Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -427,7 +427,7 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S } void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException) + throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -437,7 +437,7 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rProperty } Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index 74baf2737726..afbd849eb08d 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -70,7 +70,7 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) } Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -92,7 +92,7 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() } Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { PropertyDataHash::iterator aIter = maMap.find( rName ); @@ -110,7 +110,7 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rNam } sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::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 e5d52a7546d0..aa2c6bf9b0b4 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -72,23 +72,23 @@ namespace comphelper virtual ~GenericPropertySet() throw(); // XInterface - virtual Any SAL_CALL queryAggregation( const Type & rType ) throw( RuntimeException); - virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException); + virtual Any SAL_CALL queryAggregation( const Type & rType ) throw( RuntimeException, std::exception); + virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes( ) throw( RuntimeException); - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw( RuntimeException); + virtual Sequence< Type > SAL_CALL getTypes( ) throw( RuntimeException, std::exception); + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw( RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ); // XPropertySet - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); }; } @@ -104,7 +104,7 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw() GenericPropertySet::~GenericPropertySet() throw() { } -void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); if ( xInfo.is() ) @@ -126,7 +126,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) +void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { ResettableMutexGuard aGuard( maMutex ); Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); @@ -193,13 +193,13 @@ void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry* // XInterface Any SAL_CALL GenericPropertySet::queryInterface( const Type & rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { Any aAny; @@ -228,7 +228,7 @@ void SAL_CALL GenericPropertySet::release() throw() } uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 5 ); uno::Type* pTypes = aTypes.getArray(); @@ -248,24 +248,24 @@ namespace } uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return theGenericPropertySetImplmentationId::get().getSeq(); } // XServiceInfo -sal_Bool SAL_CALL GenericPropertySet::supportsService( const OUString& ServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL GenericPropertySet::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL GenericPropertySet::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL GenericPropertySet::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.comphelper.GenericPropertySet" ); } Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Sequence< OUString > aSNS( 1 ); aSNS.getArray()[0] = "com.sun.star.beans.XPropertySet"; diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 4fb1cc4c95ea..0136f2862b1a 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -87,7 +87,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) + void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { Sequence< Type > aTypes; bool AllowEmptyPropertyName(false); @@ -138,18 +138,18 @@ namespace comphelper } - OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException) + OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException, std::exception) { return getImplementationName_static(); } - ::sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -191,40 +191,40 @@ namespace comphelper ::sal_Bool SAL_CALL OPropertyBag::isModified() - throw (RuntimeException) + throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_isModified; } void SAL_CALL OPropertyBag::setModified( ::sal_Bool bModified ) - throw (PropertyVetoException, RuntimeException) + throw (PropertyVetoException, RuntimeException, std::exception) { setModifiedImpl(bModified, false); } void SAL_CALL OPropertyBag::addModifyListener( const Reference< XModifyListener > & xListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_NotifyListeners.addInterface(xListener); } void SAL_CALL OPropertyBag::removeModifyListener( const Reference< XModifyListener > & xListener) - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_NotifyListeners.removeInterface(xListener); } - Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo( ) throw(RuntimeException) + Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ); } - ::sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) throw (RuntimeException) + ::sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) throw (RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -232,7 +232,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException) + void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) { // 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. @@ -259,7 +259,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { // 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,7 +268,7 @@ namespace comphelper - Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration( ) throw (RuntimeException) + Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration( ) throw (RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -276,7 +276,7 @@ namespace comphelper } - Type SAL_CALL OPropertyBag::getElementType( ) throw (RuntimeException) + Type SAL_CALL OPropertyBag::getElementType( ) throw (RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -284,7 +284,7 @@ namespace comphelper } - ::sal_Bool SAL_CALL OPropertyBag::hasElements( ) throw (RuntimeException) + ::sal_Bool SAL_CALL OPropertyBag::hasElements( ) throw (RuntimeException, std::exception) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -304,7 +304,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception) + void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) { m_aDynamicProperties.setFastPropertyValue( nHandle, rValue ); } @@ -345,7 +345,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) + void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -368,7 +368,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) + void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -411,7 +411,7 @@ namespace comphelper } - Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues( ) throw (RuntimeException) + Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -544,7 +544,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); impl_setPropertyValues_throw( _rProps ); diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index d196e8536ae2..355eeea8a594 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -106,64 +106,64 @@ namespace comphelper /** === begin UNO interface implementations == **/ // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XModifiable: virtual ::sal_Bool SAL_CALL isModified( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > & xListener) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > & xListener) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyBag_PBase::setPropertyValue(p1, p2); } - virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { return OPropertyBag_PBase::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyBag_PBase::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyBag_PBase::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyBag_PBase::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyBag_PBase::removeVetoableChangeListener(p1, p2); } // XSet - virtual ::sal_Bool SAL_CALL has( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL insert( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL has( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insert( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL remove( const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); // XEnumerationAccess (base of XSet) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XElementAccess (basf of XEnumerationAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); /** === UNO interface implementations == **/ // XPropertyState @@ -175,7 +175,7 @@ namespace comphelper // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::lang::IllegalArgumentException); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception, std::exception); virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // IEventNotificationHook diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index c4a66b68d4cb..30fe378a5e59 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -454,7 +454,7 @@ OPropertySetAggregationHelper::~OPropertySetAggregationHelper() } - ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aReturn = OPropertyStateHelper::queryInterface(_rType); @@ -485,7 +485,7 @@ void OPropertySetAggregationHelper::disposing() } -void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star::lang::EventObject& _rSource) throw ( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star::lang::EventObject& _rSource) throw ( ::com::sun::star::uno::RuntimeException, std::exception) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::disposing : don't have an aggregate anymore !"); if (_rSource.Source == m_xAggregateSet) @@ -493,7 +493,7 @@ void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star:: } -void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent>& _rEvents) throw( ::com::sun::star::uno::RuntimeException) +void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent>& _rEvents) throw( ::com::sun::star::uno::RuntimeException, std::exception) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::propertiesChange : have no aggregate !"); @@ -545,7 +545,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const ::com::sun: } -void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::vetoableChange : have no aggregate !"); @@ -597,7 +597,7 @@ void OPropertySetAggregationHelper::startListening() void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& _rxListener) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertySetHelper::addVetoableChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -607,7 +607,7 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUS void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& _rxListener) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertyChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -617,7 +617,7 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUS void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener>& _rxListener) - throw( ::com::sun::star::uno::RuntimeException) + throw( ::com::sun::star::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertiesChangeListener(_rPropertyNames, _rxListener); if (!m_bListening) @@ -646,7 +646,7 @@ OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) co void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; @@ -688,7 +688,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; @@ -711,7 +711,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) - throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) + 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" ); @@ -897,7 +897,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // XPropertyState ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( _rPropertyName ); @@ -922,7 +922,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName(_rPropertyName); @@ -955,7 +955,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName) - throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -998,7 +998,7 @@ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& } -void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ) +void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) { 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 c8cc99004556..6fd333525411 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -52,7 +52,7 @@ OPropertyContainer::~OPropertyContainer() } -Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException) +Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException, std::exception) { // just the types from our one and only base class ::cppu::OTypeCollection aTypes( @@ -64,7 +64,7 @@ Sequence< Type > SAL_CALL OPropertyContainer::getTypes() throw (RuntimeException } -void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { OPropertySetHelper::setFastPropertyValue( nHandle, rValue ); } diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index beb0358e861a..32cbdac22e05 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -77,12 +77,12 @@ PropertySetHelper::~PropertySetHelper() throw() } // XPropertySet -Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return mp->mpInfo; } -void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { PropertyMapEntry const * aEntries[2]; aEntries[0] = mp->find( aPropertyName ); @@ -95,7 +95,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName _setPropertyValues( (const PropertyMapEntry**)aEntries, &aValue ); } -Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyMapEntry const * aEntries[2]; aEntries[0] = mp->find( PropertyName ); @@ -111,28 +111,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) +void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } // XMultiPropertySet -void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -163,7 +163,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& } } -Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException) +Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -197,23 +197,23 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< O return aValues; } -void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) { // todo } -void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) { // todo } // XPropertyState -PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) +PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyMapEntry const * aEntries[2]; @@ -229,7 +229,7 @@ PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& Prop return aState; } -Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) +Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyName.getLength(); @@ -264,7 +264,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S return aStates; } -void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyMapEntry const *pEntry = mp->find( PropertyName ); if( NULL == pEntry ) @@ -273,7 +273,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyN _setPropertyToDefault( pEntry ); } -Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyMapEntry const * pEntry = mp->find( aPropertyName ); if( NULL == pEntry ) diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index 4e6a0e977892..779f1df5e0b0 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -171,17 +171,17 @@ void PropertySetInfo::remove( const OUString& aName ) throw() mpMap->remove( aName ); } -Sequence< ::com::sun::star::beans::Property > SAL_CALL PropertySetInfo::getProperties() throw(::com::sun::star::uno::RuntimeException) +Sequence< ::com::sun::star::beans::Property > SAL_CALL PropertySetInfo::getProperties() throw(::com::sun::star::uno::RuntimeException, std::exception) { return mpMap->getProperties(); } -Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { return mpMap->getPropertyByName( aName ); } -sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return mpMap->hasPropertyByName( Name ); } diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx index ab7774887d00..7c9e7dfece70 100644 --- a/comphelper/source/property/propertystatecontainer.cxx +++ b/comphelper/source/property/propertystatecontainer.cxx @@ -55,7 +55,7 @@ namespace comphelper } - Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) throw (RuntimeException) + Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { Any aReturn = OPropertyContainer::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -80,13 +80,13 @@ namespace comphelper } - PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) { return getPropertyStateByHandle( getHandleForName( _rPropertyName ) ); } - Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException) + Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException, std::exception) { sal_Int32 nProperties = _rPropertyNames.getLength(); Sequence< PropertyState> aStates( nProperties ); @@ -139,13 +139,13 @@ namespace comphelper } - void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) { setPropertyToDefaultByHandle( getHandleForName( _rPropertyName ) ); } - Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { Any aDefault; getPropertyDefaultByHandle( getHandleForName( _rPropertyName ), aDefault ); diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx index dbeee362caa8..e4f067483d6a 100644 --- a/comphelper/source/property/propmultiplex.cxx +++ b/comphelper/source/property/propmultiplex.cxx @@ -128,7 +128,7 @@ void OPropertyChangeMultiplexer::dispose() // XEventListener -void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException) +void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException, std::exception) { if (m_pListener) { @@ -149,7 +149,7 @@ void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSourc // XPropertyChangeListener -void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeEvent& _rEvent ) throw( RuntimeException) +void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeEvent& _rEvent ) throw( RuntimeException, std::exception) { if (m_pListener && !locked()) m_pListener->_propertyChanged(_rEvent); diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index bafdf1c5b37f..ad84d44e3687 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -44,7 +44,7 @@ namespace comphelper //===================================================================== - ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const ::com::sun::star::uno::Type& _rType) throw( ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType); // our own ifaces @@ -55,7 +55,7 @@ namespace comphelper } - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> OPropertyStateHelper::getTypes() throw( ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> OPropertyStateHelper::getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> aTypes(4); ::com::sun::star::uno::Type* pTypes = aTypes.getArray(); @@ -83,7 +83,7 @@ namespace comphelper // XPropertyState - ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -95,7 +95,7 @@ namespace comphelper } - void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -107,7 +107,7 @@ namespace comphelper } - ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -119,7 +119,7 @@ namespace comphelper } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) { sal_Int32 nLen = _rPropertyNames.getLength(); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> aRet(nLen); @@ -191,7 +191,7 @@ namespace comphelper } - Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() throw(RuntimeException) + Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() throw(RuntimeException, std::exception) { Sequence< Type > aOwnTypes( 2 ); aOwnTypes[0] = cppu::UnoType::get(); @@ -206,14 +206,14 @@ namespace comphelper namespace { struct lcl_ImplId : public rtl::Static< ::cppu::OImplementationId, lcl_ImplId > {}; } - Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException) + Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException, std::exception) { ::cppu::OImplementationId &rID = lcl_ImplId::get(); return rID.getImplementationId(); } - Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) throw(RuntimeException) + Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) { Any aReturn = OWeakObject::queryInterface( _rType ); if ( !aReturn.hasValue() ) diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index 906e62e513d3..380e64ca3623 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -46,28 +46,28 @@ public: virtual ~UNOMemoryStream(); // XStream - virtual Reference< XInputStream > SAL_CALL getInputStream( ) throw (RuntimeException); - virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) throw (RuntimeException); + virtual Reference< XInputStream > SAL_CALL getInputStream( ) throw (RuntimeException, std::exception); + virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) throw (RuntimeException, std::exception); // XInputStream - virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual sal_Int32 SAL_CALL available() throw (NotConnectedException, IOException, RuntimeException); - virtual void SAL_CALL closeInput() throw (NotConnectedException, IOException, RuntimeException); + virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL available() throw (NotConnectedException, IOException, RuntimeException, std::exception); + virtual void SAL_CALL closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception); // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException); - virtual sal_Int64 SAL_CALL getPosition() throw (IOException, RuntimeException); - virtual sal_Int64 SAL_CALL getLength() throw (IOException, RuntimeException); + virtual void SAL_CALL seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getPosition() throw (IOException, RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLength() throw (IOException, RuntimeException, std::exception); // XOutputStream - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual void SAL_CALL flush() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); - virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException); + virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + virtual void SAL_CALL flush() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); + virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception); // XTruncate - virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); @@ -89,18 +89,18 @@ UNOMemoryStream::~UNOMemoryStream() } // XStream -Reference< XInputStream > SAL_CALL UNOMemoryStream::getInputStream( ) throw (RuntimeException) +Reference< XInputStream > SAL_CALL UNOMemoryStream::getInputStream( ) throw (RuntimeException, std::exception) { return this; } -Reference< XOutputStream > SAL_CALL UNOMemoryStream::getOutputStream( ) throw (RuntimeException) +Reference< XOutputStream > SAL_CALL UNOMemoryStream::getOutputStream( ) throw (RuntimeException, std::exception) { return this; } // XInputStream -sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) +sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if( nBytesToRead < 0 ) throw IOException(); @@ -120,12 +120,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) +sal_Int32 SAL_CALL UNOMemoryStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { return readBytes( aData, nMaxBytesToRead ); } -void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) +void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { if( nBytesToSkip < 0 ) throw IOException(); @@ -133,18 +133,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) +sal_Int32 SAL_CALL UNOMemoryStream::available() throw (NotConnectedException, IOException, RuntimeException, std::exception) { return static_cast< sal_Int32 >( maData.size() ) - mnCursor; } -void SAL_CALL UNOMemoryStream::closeInput() throw (NotConnectedException, IOException, RuntimeException) +void SAL_CALL UNOMemoryStream::closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception) { mnCursor = 0; } // XSeekable -void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException) +void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) { if( (location < 0) || (location > SAL_MAX_INT32) ) throw IllegalArgumentException("this implementation does not support more than 2GB!", Reference< XInterface >(static_cast(this)), 0 ); @@ -159,18 +159,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) +sal_Int64 SAL_CALL UNOMemoryStream::getPosition() throw (IOException, RuntimeException, std::exception) { return static_cast< sal_Int64 >( mnCursor ); } -sal_Int64 SAL_CALL UNOMemoryStream::getLength() throw (IOException, RuntimeException) +sal_Int64 SAL_CALL UNOMemoryStream::getLength() throw (IOException, RuntimeException, std::exception) { return static_cast< sal_Int64 >( maData.size() ); } // XOutputStream -void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) +void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { const sal_Int32 nBytesToWrite( aData.getLength() ); if( nBytesToWrite ) @@ -193,17 +193,17 @@ void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) t } } -void SAL_CALL UNOMemoryStream::flush() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) +void SAL_CALL UNOMemoryStream::flush() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { } -void SAL_CALL UNOMemoryStream::closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) +void SAL_CALL UNOMemoryStream::closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { mnCursor = 0; } //XTruncate -void SAL_CALL UNOMemoryStream::truncate() throw (IOException, RuntimeException) +void SAL_CALL UNOMemoryStream::truncate() throw (IOException, RuntimeException, std::exception) { maData.resize( 0 ); mnCursor = 0; diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index f49a9d653f1f..03f169dd9b0c 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -38,7 +38,7 @@ OSLInputStreamWrapper::~OSLInputStreamWrapper() sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) + throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { if (!m_pFile) throw stario::NotConnectedException(OUString(), static_cast(this)); @@ -63,7 +63,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 } -sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) +sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { if (!m_pFile) throw stario::NotConnectedException(OUString(), static_cast(this)); @@ -75,7 +75,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_I } -void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) +void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) @@ -93,7 +93,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st } -sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException ) +sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) @@ -123,7 +123,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnecte } -void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException ) +void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException, std::exception ) { if (!m_pFile) throw stario::NotConnectedException(OUString(), static_cast(this)); @@ -143,7 +143,7 @@ OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile): OSLOutputStreamWrapper::~OSLOutputStreamWrapper() {} -void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) +void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { sal_uInt64 nWritten; FileBase::RC eError = rFile.write(aData.getConstArray(),aData.getLength(), nWritten); @@ -155,12 +155,12 @@ void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_In } -void SAL_CALL OSLOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) +void SAL_CALL OSLOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { } -void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) +void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException, std::exception ) { rFile.close(); } diff --git a/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx index 3f0f49c3f284..da3b3690516f 100644 --- a/comphelper/source/streaming/seekableinput.cxx +++ b/comphelper/source/streaming/seekableinput.cxx @@ -119,7 +119,7 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readBytes( uno::Sequence< sal_Int8 >& throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -136,7 +136,7 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readSomeBytes( uno::Sequence< sal_Int8 throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -153,7 +153,7 @@ void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -169,7 +169,7 @@ void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL OSeekableInputWrapper::available() throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -185,7 +185,7 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::available() void SAL_CALL OSeekableInputWrapper::closeInput() throw ( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -210,7 +210,7 @@ void SAL_CALL OSeekableInputWrapper::closeInput() void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location ) throw ( lang::IllegalArgumentException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -225,7 +225,7 @@ void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location ) sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -240,7 +240,7 @@ sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition() sal_Int64 SAL_CALL OSeekableInputWrapper::getLength() throw ( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index 80c07a51b809..fd39398445b2 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -49,9 +49,9 @@ public: explicit SequenceInputStreamService(); // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException ); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException, std::exception ); + virtual ::sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException, std::exception ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ); // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); @@ -59,19 +59,19 @@ public: static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); // ::com::sun::star::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 ); - virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException ); - virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException ); - virtual ::sal_Int32 SAL_CALL available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException ); - virtual void SAL_CALL closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException ); + 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 ); + 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 ); + virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ); + virtual ::sal_Int32 SAL_CALL available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ); + virtual void SAL_CALL closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ); // ::com::sun::star::io::XSeekable: - virtual void SAL_CALL seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException ); - virtual ::sal_Int64 SAL_CALL getPosition() throw ( uno::RuntimeException, io::IOException ); - virtual ::sal_Int64 SAL_CALL getLength() throw ( uno::RuntimeException, io::IOException ); + virtual void SAL_CALL seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception ); + virtual ::sal_Int64 SAL_CALL getPosition() throw ( uno::RuntimeException, io::IOException, std::exception ); + virtual ::sal_Int64 SAL_CALL getLength() throw ( uno::RuntimeException, io::IOException, std::exception ); // ::com::sun::star::lang::XInitialization: - virtual void SAL_CALL initialize( const uno::Sequence< ::com::sun::star::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception ); + virtual void SAL_CALL initialize( const uno::Sequence< ::com::sun::star::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ); private: SequenceInputStreamService( SequenceInputStreamService & ); // not defined @@ -91,7 +91,7 @@ SequenceInputStreamService::SequenceInputStreamService() {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException ) +OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException, std::exception ) { return getImplementationName_static(); } @@ -101,12 +101,12 @@ OUString SAL_CALL SequenceInputStreamService::getImplementationName_static() return OUString( "com.sun.star.comp.SequenceInputStreamService" ); } -::sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException ) +::sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } -uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) { return getSupportedServiceNames_static(); } @@ -125,7 +125,7 @@ uno::Reference< uno::XInterface > SAL_CALL SequenceInputStreamService::Create( } // ::com::sun::star::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 ) +::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 ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -134,7 +134,7 @@ uno::Reference< uno::XInterface > SAL_CALL SequenceInputStreamService::Create( 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 ) +::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 ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -143,7 +143,7 @@ uno::Reference< uno::XInterface > SAL_CALL SequenceInputStreamService::Create( return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead ); } -void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException ) +void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -152,7 +152,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 ) +::sal_Int32 SAL_CALL SequenceInputStreamService::available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -161,7 +161,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 ) +void SAL_CALL SequenceInputStreamService::closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -173,7 +173,7 @@ void SAL_CALL SequenceInputStreamService::closeInput() throw ( uno::RuntimeExcep } // ::com::sun::star::io::XSeekable: -void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException ) +void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xSeekable.is() ) @@ -182,7 +182,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 ) +::sal_Int64 SAL_CALL SequenceInputStreamService::getPosition() throw ( uno::RuntimeException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xSeekable.is() ) @@ -191,7 +191,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 ) +::sal_Int64 SAL_CALL SequenceInputStreamService::getLength() throw ( uno::RuntimeException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xSeekable.is() ) @@ -201,7 +201,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u } // ::com::sun::star::lang::XInitialization: -void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< ::com::sun::star::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception ) +void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< ::com::sun::star::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index c5026f84d99b..8a74a6ee18de 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -43,9 +43,9 @@ public: explicit SequenceOutputStreamService(); // ::com::sun::star::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException ); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException, std::exception ); + virtual ::sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException, std::exception ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ); // XServiceInfo - static versions (used for component registration) static OUString SAL_CALL getImplementationName_static(); @@ -53,12 +53,12 @@ public: static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); // ::com::sun::star::io::XOutputStream: - virtual void SAL_CALL writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException ); - virtual void SAL_CALL flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException ); - virtual void SAL_CALL closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException ); + virtual void SAL_CALL writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception ); + virtual void SAL_CALL flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ); + virtual void SAL_CALL closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ); // ::com::sun::star::io::XSequenceOutputStream: - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes( ) throw ( io::NotConnectedException, io::IOException, uno::RuntimeException); + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes( ) throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception); private: SequenceOutputStreamService( SequenceOutputStreamService & ); //not defined @@ -77,7 +77,7 @@ SequenceOutputStreamService::SequenceOutputStreamService() } // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException ) +OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException, std::exception ) { return getImplementationName_static(); } @@ -87,12 +87,12 @@ OUString SAL_CALL SequenceOutputStreamService::getImplementationName_static() return OUString("com.sun.star.comp.SequenceOutputStreamService"); } -::sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException ) +::sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } -uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) { return getSupportedServiceNames_static(); } @@ -111,7 +111,7 @@ uno::Reference< uno::XInterface > SAL_CALL SequenceOutputStreamService::Create( } // ::com::sun::star::io::XOutputStream: -void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException ) +void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) @@ -121,7 +121,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 ) +void SAL_CALL SequenceOutputStreamService::flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) @@ -130,7 +130,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 ) +void SAL_CALL SequenceOutputStreamService::closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) @@ -141,7 +141,7 @@ void SAL_CALL SequenceOutputStreamService::closeOutput() throw ( uno::RuntimeExc } // ::com::sun::star::io::XSequenceOutputStream: -uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenBytes() throw ( io::NotConnectedException, io::IOException, uno::RuntimeException) +uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenBytes() throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index fefc42b716fe..2e1552a26af5 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -54,7 +54,7 @@ inline sal_Int32 SequenceInputStream::avail() sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence& aData, sal_Int32 nBytesToRead ) throw(NotConnectedException, BufferSizeExceededException, - IOException, RuntimeException) + IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -76,7 +76,7 @@ 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) + IOException, RuntimeException, std::exception) { // all data is available at once return readBytes(aData, nMaxBytesToRead); @@ -85,7 +85,7 @@ sal_Int32 SAL_CALL SequenceInputStream::readSomeBytes( Sequence& aData void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip ) throw(NotConnectedException, BufferSizeExceededException, - IOException, RuntimeException) + IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -102,7 +102,7 @@ void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL SequenceInputStream::available( ) - throw(NotConnectedException, IOException, RuntimeException) + throw(NotConnectedException, IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -111,7 +111,7 @@ sal_Int32 SAL_CALL SequenceInputStream::available( ) void SAL_CALL SequenceInputStream::closeInput( ) - throw(NotConnectedException, IOException, RuntimeException) + throw(NotConnectedException, IOException, RuntimeException, std::exception) { if (m_nPos == -1) throw NotConnectedException(OUString(), *this); @@ -119,19 +119,19 @@ void SAL_CALL SequenceInputStream::closeInput( ) m_nPos = -1; } -void SAL_CALL SequenceInputStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException) +void SAL_CALL SequenceInputStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) { 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) +sal_Int64 SAL_CALL SequenceInputStream::getPosition() throw (IOException, RuntimeException, std::exception) { return m_nPos; } -sal_Int64 SAL_CALL SequenceInputStream::getLength( ) throw (IOException, RuntimeException) +sal_Int64 SAL_CALL SequenceInputStream::getLength( ) throw (IOException, RuntimeException, std::exception) { return m_aData.getLength(); } @@ -157,7 +157,7 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence< sal_Int8 >& _rSeq, double } -void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) +void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); if (!m_bConnected) @@ -208,7 +208,7 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rD } -void SAL_CALL OSequenceOutputStream::flush( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) +void SAL_CALL OSequenceOutputStream::flush( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); if (!m_bConnected) @@ -219,7 +219,7 @@ void SAL_CALL OSequenceOutputStream::flush( ) throw(NotConnectedException, Buff } -void SAL_CALL OSequenceOutputStream::closeOutput( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) +void SAL_CALL OSequenceOutputStream::closeOutput( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); if (!m_bConnected) diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index 33157cf92df0..29d8d9681c71 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -54,17 +54,17 @@ struct AttributeList_Impl ::std::vector vecAttribute; }; -sal_Int16 SAL_CALL AttributeList::getLength(void) throw( ::com::sun::star::uno::RuntimeException ) +sal_Int16 SAL_CALL AttributeList::getLength(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return (sal_Int16)(m_pImpl->vecAttribute.size()); } -OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { 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( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { if( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) { return m_pImpl->vecAttribute[i].sType; @@ -72,12 +72,12 @@ OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( ::com::sun:: return OUString(); } -OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { 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( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::std::vector::iterator ii = m_pImpl->vecAttribute.begin(); @@ -89,7 +89,7 @@ OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( : return OUString(); } -OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::std::vector::iterator ii = m_pImpl->vecAttribute.begin(); diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index 85e625cb85c2..4c0146bee04a 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -233,19 +233,19 @@ uno::Sequence< uno::Sequence< beans::StringPair > > OFOPXMLHelper::GetParsingRes void SAL_CALL OFOPXMLHelper::startDocument() - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::endDocument() - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { if ( m_nFormat == RELATIONINFO_FORMAT ) { @@ -393,7 +393,7 @@ void SAL_CALL OFOPXMLHelper::startElement( const OUString& aName, const uno::Ref void SAL_CALL OFOPXMLHelper::endElement( const OUString& aName ) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT ) { @@ -410,25 +410,25 @@ void SAL_CALL OFOPXMLHelper::endElement( const OUString& aName ) void SAL_CALL OFOPXMLHelper::characters( const OUString& /*aChars*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) - throw(xml::sax::SAXException, uno::RuntimeException) + throw(xml::sax::SAXException, uno::RuntimeException, std::exception) { } diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 8e4bd8256de1..571a1e6eed74 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -151,7 +151,7 @@ void Access::initBroadcaster( } css::uno::Sequence< css::uno::Type > Access::getTypes() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -203,7 +203,7 @@ css::uno::Sequence< css::uno::Type > Access::getTypes() } css::uno::Sequence< sal_Int8 > Access::getImplementationId() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -211,7 +211,7 @@ css::uno::Sequence< sal_Int8 > Access::getImplementationId() return css::uno::Sequence< sal_Int8 >(); } -OUString Access::getImplementationName() throw (css::uno::RuntimeException) +OUString Access::getImplementationName() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -220,13 +220,13 @@ OUString Access::getImplementationName() throw (css::uno::RuntimeException) } sal_Bool Access::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< OUString > Access::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -257,7 +257,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames() return services.getAsConstList(); } -void Access::dispose() throw (css::uno::RuntimeException) { +void Access::dispose() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); Broadcaster bc; { @@ -280,7 +280,7 @@ void Access::dispose() throw (css::uno::RuntimeException) { void Access::addEventListener( css::uno::Reference< css::lang::XEventListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); { @@ -303,7 +303,7 @@ void Access::addEventListener( void Access::removeEventListener( css::uno::Reference< css::lang::XEventListener > const & aListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -314,7 +314,7 @@ void Access::removeEventListener( } } -css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) { +css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -337,7 +337,7 @@ css::uno::Type Access::getElementType() throw (css::uno::RuntimeException) { } } -sal_Bool Access::hasElements() throw (css::uno::RuntimeException) { +sal_Bool Access::hasElements() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -347,7 +347,7 @@ sal_Bool Access::hasElements() throw (css::uno::RuntimeException) { css::uno::Any Access::getByName(OUString const & aName) throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -361,7 +361,7 @@ css::uno::Any Access::getByName(OUString const & aName) } css::uno::Sequence< OUString > Access::getElementNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -378,7 +378,7 @@ css::uno::Sequence< OUString > Access::getElementNames() } sal_Bool Access::hasByName(OUString const & aName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -387,7 +387,7 @@ sal_Bool Access::hasByName(OUString const & aName) } css::uno::Any Access::getByHierarchicalName(OUString const & aName) - throw (css::container::NoSuchElementException, css::uno::RuntimeException) + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -401,7 +401,7 @@ css::uno::Any Access::getByHierarchicalName(OUString const & aName) } sal_Bool Access::hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -414,7 +414,7 @@ void Access::replaceByHierarchicalName( throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { //TODO: Actually support sets and combine with replaceByName: assert(thisIs(IS_UPDATE)); @@ -457,7 +457,7 @@ void Access::replaceByHierarchicalName( void Access::addContainerListener( css::uno::Reference< css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); { @@ -480,7 +480,7 @@ void Access::addContainerListener( void Access::removeContainerListener( css::uno::Reference< css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -492,7 +492,7 @@ void Access::removeContainerListener( } OUString Access::getExactName(OUString const & aApproximateName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -501,7 +501,7 @@ OUString Access::getExactName(OUString const & aApproximateName) } css::uno::Sequence< css::beans::Property > Access::getProperties() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -517,7 +517,7 @@ css::uno::Sequence< css::beans::Property > Access::getProperties() } css::beans::Property Access::getPropertyByName(OUString const & aName) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -530,14 +530,14 @@ css::beans::Property Access::getPropertyByName(OUString const & aName) } sal_Bool Access::hasPropertyByName(OUString const & Name) - throw (css::uno::RuntimeException) + 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) { +OUString Access::getHierarchicalName() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -561,7 +561,7 @@ OUString Access::composeHierarchicalName( OUString const & aRelativeName) throw ( css::lang::IllegalArgumentException, css::lang::NoSupportException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -579,7 +579,7 @@ OUString Access::composeHierarchicalName( return path.makeStringAndClear(); } -OUString Access::getName() throw (css::uno::RuntimeException) { +OUString Access::getName() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -587,7 +587,7 @@ OUString Access::getName() throw (css::uno::RuntimeException) { } void Access::setName(OUString const & aName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); Broadcaster bc; @@ -651,7 +651,7 @@ void Access::setName(OUString const & aName) bc.send(); } -css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException) +css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -660,7 +660,7 @@ css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException) } css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); return this; @@ -671,7 +671,7 @@ void Access::setPropertyValue( throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -695,7 +695,7 @@ void Access::setPropertyValue( css::uno::Any Access::getPropertyValue(OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -713,7 +713,7 @@ void Access::addPropertyChangeListener( xListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); { @@ -740,7 +740,7 @@ void Access::removePropertyChangeListener( aListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -764,7 +764,7 @@ void Access::addVetoableChangeListener( aListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); { @@ -792,7 +792,7 @@ void Access::removeVetoableChangeListener( aListener) throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -815,7 +815,7 @@ void Access::setPropertyValues( css::uno::Sequence< css::uno::Any > const & aValues) throw ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -847,7 +847,7 @@ void Access::setPropertyValues( css::uno::Sequence< css::uno::Any > Access::getPropertyValues( css::uno::Sequence< OUString > const & aPropertyNames) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -868,7 +868,7 @@ void Access::addPropertiesChangeListener( css::uno::Sequence< OUString > const &, css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); { @@ -891,7 +891,7 @@ void Access::addPropertiesChangeListener( void Access::removePropertiesChangeListener( css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -906,7 +906,7 @@ void Access::firePropertiesChangeEvent( css::uno::Sequence< OUString > const & aPropertyNames, css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); css::uno::Sequence< css::beans::PropertyChangeEvent > events( @@ -921,7 +921,7 @@ void Access::firePropertiesChangeEvent( } css::uno::Reference< css::beans::XHierarchicalPropertySetInfo > -Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException) { +Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); return this; } @@ -932,7 +932,7 @@ void Access::setHierarchicalPropertyValue( throw ( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -963,7 +963,7 @@ css::uno::Any Access::getHierarchicalPropertyValue( throw ( css::beans::UnknownPropertyException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -981,7 +981,7 @@ void Access::setHierarchicalPropertyValues( css::uno::Sequence< css::uno::Any > const & Values) throw ( css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -1020,7 +1020,7 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues( css::uno::Sequence< OUString > const & aHierarchicalPropertyNames) throw ( css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException) + css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1042,7 +1042,7 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues( css::beans::Property Access::getPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) + throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1056,7 +1056,7 @@ css::beans::Property Access::getPropertyByHierarchicalName( sal_Bool Access::hasPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1068,7 +1068,7 @@ void Access::replaceByName( throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_UPDATE)); Broadcaster bc; @@ -1112,7 +1112,7 @@ void Access::insertByName( throw ( css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_EXTENSIBLE|IS_UPDATE)); Broadcaster bc; @@ -1162,7 +1162,7 @@ void Access::insertByName( void Access::removeByName(OUString const & aName) throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_EXTENSIBLE|IS_UPDATE)); Broadcaster bc; @@ -1197,7 +1197,7 @@ void Access::removeByName(OUString const & aName) } css::uno::Reference< css::uno::XInterface > Access::createInstance() - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_SET|IS_UPDATE)); OUString tmplName( @@ -1217,7 +1217,7 @@ 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) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_SET|IS_UPDATE)); if (aArguments.getLength() != 0) { @@ -1314,7 +1314,7 @@ void Access::clearListeners() throw() { } css::uno::Any Access::queryInterface(css::uno::Type const & aType) - throw (css::uno::RuntimeException) + 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 6703568fbd57..18e1681af957 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -136,60 +136,60 @@ public: using OWeakObject::release; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL - getTypes() throw (com::sun::star::uno::RuntimeException); + getTypes() throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (com::sun::star::uno::RuntimeException); + getImplementationId() throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException); + getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL dispose() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addEventListener( com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > const & xListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeEventListener( com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > const & aListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Type SAL_CALL getElementType() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasElements() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Any SAL_CALL getByName( OUString const & aName) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getElementNames() throw (com::sun::star::uno::RuntimeException); + getElementNames() throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByName(OUString const & aName) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Any SAL_CALL getByHierarchicalName( OUString const & aName) throw ( com::sun::star::container::NoSuchElementException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL replaceByHierarchicalName( OUString const & aName, com::sun::star::uno::Any const & aElement) @@ -197,56 +197,56 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addContainerListener( com::sun::star::uno::Reference< com::sun::star::container::XContainerListener > const & xListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeContainerListener( com::sun::star::uno::Reference< com::sun::star::container::XContainerListener > const & xListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getExactName( OUString const & aApproximateName) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - SAL_CALL getProperties() throw (com::sun::star::uno::RuntimeException); + SAL_CALL getProperties() throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( OUString const & aName) throw ( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getHierarchicalName() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL composeHierarchicalName( OUString const & aRelativeName) throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getName() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setName(OUString const & aName) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::beans::Property SAL_CALL getAsProperty() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() throw (com::sun::star::uno::RuntimeException); + SAL_CALL getPropertySetInfo() throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( OUString const & aPropertyName, @@ -256,14 +256,14 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( OUString const & aPropertyName, @@ -272,7 +272,7 @@ public: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertyChangeListener( OUString const & aPropertyName, @@ -281,7 +281,7 @@ public: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addVetoableChangeListener( OUString const & PropertyName, @@ -290,7 +290,7 @@ public: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( OUString const & PropertyName, @@ -299,7 +299,7 @@ public: throw ( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValues( com::sun::star::uno::Sequence< OUString > const & aPropertyNames, @@ -309,38 +309,38 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL getPropertyValues( com::sun::star::uno::Sequence< OUString > const & aPropertyNames) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertiesChangeListener( com::sun::star::uno::Sequence< OUString > const & aPropertyNames, com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener > const & xListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertiesChangeListener( com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener > const & xListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL firePropertiesChangeEvent( com::sun::star::uno::Sequence< OUString > const & aPropertyNames, com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener > const & xListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::beans::XHierarchicalPropertySetInfo > SAL_CALL getHierarchicalPropertySetInfo() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setHierarchicalPropertyValue( OUString const & aHierarchicalPropertyName, @@ -350,7 +350,7 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Any SAL_CALL getHierarchicalPropertyValue( OUString const & aHierarchicalPropertyName) @@ -358,7 +358,7 @@ public: com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setHierarchicalPropertyValues( com::sun::star::uno::Sequence< OUString > const & @@ -369,7 +369,7 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Any > SAL_CALL getHierarchicalPropertyValues( @@ -378,17 +378,17 @@ public: throw ( com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::beans::Property SAL_CALL getPropertyByHierarchicalName(OUString const & aHierarchicalName) throw ( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL replaceByName( OUString const & aName, com::sun::star::uno::Any const & aElement) @@ -396,7 +396,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL insertByName( OUString const & aName, com::sun::star::uno::Any const & aElement) @@ -404,19 +404,19 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeByName(OUString const & aName) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL createInstance() throw ( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( @@ -424,7 +424,7 @@ public: aArguments) throw ( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); protected: Access(Components & components); @@ -446,7 +446,7 @@ protected: virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & aType) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); Components & getComponents() const; diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx index 6071df0d5b26..14dfdfa74f38 100644 --- a/configmgr/source/childaccess.cxx +++ b/configmgr/source/childaccess.cxx @@ -151,7 +151,7 @@ void ChildAccess::release() throw () { } css::uno::Reference< css::uno::XInterface > ChildAccess::getParent() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -160,7 +160,7 @@ 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) + throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -171,7 +171,7 @@ 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) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -330,7 +330,7 @@ void ChildAccess::addSupportedServiceNames( } css::uno::Any ChildAccess::queryInterface(css::uno::Type const & aType) - throw (css::uno::RuntimeException) + 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 8eb688ee2590..478aa1494000 100644 --- a/configmgr/source/childaccess.hxx +++ b/configmgr/source/childaccess.hxx @@ -85,18 +85,18 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setParent( com::sun::star::uno::Reference< com::sun::star::uno::XInterface > const &) throw ( com::sun::star::lang::NoSupportException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int64 SAL_CALL getSomething( com::sun::star::uno::Sequence< sal_Int8 > const & aIdentifier) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); void bind( rtl::Reference< RootAccess > const & root, @@ -128,7 +128,7 @@ private: virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & aType) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); 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 8a76390c84b4..40d580b5d5ca 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -115,7 +115,7 @@ private: virtual void SAL_CALL disposing() { flushModifications(); } virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return default_ ? default_provider::getImplementationName() @@ -123,11 +123,11 @@ private: } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException) + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { return default_ ? default_provider::getSupportedServiceNames() @@ -136,42 +136,42 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); 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); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() throw (css::uno::RuntimeException); + getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL refresh() throw (css::uno::RuntimeException); + virtual void SAL_CALL refresh() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL flush() throw (css::uno::RuntimeException); + virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::lang::Locale SAL_CALL getLocale() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); void flushModifications() const; @@ -183,7 +183,7 @@ private: css::uno::Reference< css::uno::XInterface > Service::createInstance( OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithArguments( aServiceSpecifier, css::uno::Sequence< css::uno::Any >()); @@ -193,7 +193,7 @@ 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) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { OUString nodepath; OUString locale; @@ -281,7 +281,7 @@ Service::createInstanceWithArguments( } css::uno::Sequence< OUString > Service::getAvailableServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > names(2); names[0] = accessServiceName; @@ -289,7 +289,7 @@ css::uno::Sequence< OUString > Service::getAvailableServiceNames() return names; } -void Service::refresh() throw (css::uno::RuntimeException) { +void Service::refresh() throw (css::uno::RuntimeException, std::exception) { //TODO cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer( cppu::UnoType< css::util::XRefreshListener >::get()); @@ -301,7 +301,7 @@ void Service::refresh() throw (css::uno::RuntimeException) { void Service::addRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType< css::util::XRefreshListener >::get(), l); @@ -309,13 +309,13 @@ void Service::addRefreshListener( void Service::removeRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType< css::util::XRefreshListener >::get(), l); } -void Service::flush() throw (css::uno::RuntimeException) { +void Service::flush() throw (css::uno::RuntimeException, std::exception) { flushModifications(); cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer( cppu::UnoType< css::util::XFlushListener >::get()); @@ -327,27 +327,27 @@ void Service::flush() throw (css::uno::RuntimeException) { void Service::addFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException) + 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) + 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) + throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(*lock_); locale_ = LanguageTag::convertToBcp47( eLocale, false); } -css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException) { +css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(*lock_); css::lang::Locale loc; if (! locale_.isEmpty()) { @@ -379,30 +379,30 @@ 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); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); 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); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return configuration_provider::getImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException) + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { 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) + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any >(), Context); @@ -412,7 +412,7 @@ 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) + 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 f22bc818ba2d..83dbd448232e 100644 --- a/configmgr/source/configurationregistry.cxx +++ b/configmgr/source/configurationregistry.cxx @@ -81,59 +81,59 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return configuration_registry::getImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException) + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { return configuration_registry::getSupportedServiceNames(); } - virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException); + virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL open( OUString const & rURL, sal_Bool bReadOnly, sal_Bool) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL close() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL destroy() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL getRootKey() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL mergeKey(OUString const &, OUString const &) throw ( css::registry::InvalidRegistryException, - css::registry::MergeConflictException, css::uno::RuntimeException); + css::registry::MergeConflictException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL flush() throw (css::uno::RuntimeException); + virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL addFlushListener( css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL removeFlushListener( css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); void checkValid(); @@ -162,154 +162,154 @@ private: virtual ~RegistryKey() {} virtual OUString SAL_CALL getKeyName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isReadOnly() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception); virtual css::registry::RegistryKeyType SAL_CALL getKeyType( OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::registry::RegistryValueType SAL_CALL getValueType() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getLongValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException); + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL setLongValue(sal_Int32) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException); + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL setLongListValue( css::uno::Sequence< sal_Int32 > const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getAsciiValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException); + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL setAsciiValue(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException); + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL setAsciiListValue( css::uno::Sequence< OUString > const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getStringValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException); + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL setStringValue(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException); + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL setStringListValue( css::uno::Sequence< OUString > const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException); + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception); virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey( OUString const & aKeyName) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL createKey(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL closeKey() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL deleteKey(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > SAL_CALL openKeys() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL createLink( OUString const &, OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual void SAL_CALL deleteLink(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getLinkTarget(OUString const &) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getResolvedName( OUString const & aKeyName) throw ( css::registry::InvalidRegistryException, - css::uno::RuntimeException); + css::uno::RuntimeException, std::exception); Service & service_; css::uno::Any value_; @@ -336,14 +336,14 @@ Service::Service( } } -OUString Service::getURL() throw (css::uno::RuntimeException) { +OUString Service::getURL() throw (css::uno::RuntimeException, std::exception) { 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) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { //TODO: bCreate osl::MutexGuard g(mutex_); @@ -371,13 +371,13 @@ void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool) readOnly_ = bReadOnly; } -sal_Bool Service::isValid() throw (css::uno::RuntimeException) { +sal_Bool Service::isValid() throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(mutex_); return access_.is(); } void Service::close() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(mutex_); checkValid(); @@ -385,7 +385,7 @@ void Service::close() } void Service::destroy() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -393,14 +393,14 @@ void Service::destroy() } css::uno::Reference< css::registry::XRegistryKey > Service::getRootKey() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + 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) { +sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(mutex_); checkValid_RuntimeException(); return readOnly_; @@ -409,14 +409,14 @@ sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException) { void Service::mergeKey(OUString const &, OUString const &) throw ( css::registry::InvalidRegistryException, - css::registry::MergeConflictException, css::uno::RuntimeException) + 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) +void Service::flush() throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -425,7 +425,7 @@ void Service::flush() throw (css::uno::RuntimeException) void Service::addFlushListener( css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -434,7 +434,7 @@ void Service::addFlushListener( void Service::removeFlushListener( css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -461,7 +461,7 @@ void Service::doClose() { access_.clear(); } -OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException) { +OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); css::uno::Reference< css::container::XNamed > named; @@ -474,19 +474,19 @@ OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException) { } sal_Bool RegistryKey::isReadOnly() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + 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) { +sal_Bool RegistryKey::isValid() throw (css::uno::RuntimeException, std::exception) { return service_.isValid(); } css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -494,7 +494,7 @@ css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &) } css::registry::RegistryValueType RegistryKey::getValueType() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -524,7 +524,7 @@ css::registry::RegistryValueType RegistryKey::getValueType() sal_Int32 RegistryKey::getLongValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException) + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -538,7 +538,7 @@ sal_Int32 RegistryKey::getLongValue() } void RegistryKey::setLongValue(sal_Int32) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -548,7 +548,7 @@ void RegistryKey::setLongValue(sal_Int32) css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException) + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -562,7 +562,7 @@ css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue() } void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -572,7 +572,7 @@ void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &) OUString RegistryKey::getAsciiValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException) + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -586,7 +586,7 @@ OUString RegistryKey::getAsciiValue() } void RegistryKey::setAsciiValue(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -596,7 +596,7 @@ void RegistryKey::setAsciiValue(OUString const &) css::uno::Sequence< OUString > RegistryKey::getAsciiListValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException) + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -610,7 +610,7 @@ css::uno::Sequence< OUString > RegistryKey::getAsciiListValue() } void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -620,7 +620,7 @@ void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &) OUString RegistryKey::getStringValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException) + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -634,7 +634,7 @@ OUString RegistryKey::getStringValue() } void RegistryKey::setStringValue(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -644,7 +644,7 @@ void RegistryKey::setStringValue(OUString const &) css::uno::Sequence< OUString > RegistryKey::getStringListValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException) + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -659,7 +659,7 @@ css::uno::Sequence< OUString > RegistryKey::getStringListValue() void RegistryKey::setStringListValue( css::uno::Sequence< OUString > const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -669,7 +669,7 @@ void RegistryKey::setStringListValue( css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue() throw ( css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException) + css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -683,7 +683,7 @@ css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue() } void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -692,7 +692,7 @@ 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) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); @@ -709,7 +709,7 @@ 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) + css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -718,14 +718,14 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey( void RegistryKey::closeKey() throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException) + 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) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -734,7 +734,7 @@ void RegistryKey::deleteKey(OUString const &) css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > RegistryKey::openKeys() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -742,7 +742,7 @@ RegistryKey::openKeys() } css::uno::Sequence< OUString > RegistryKey::getKeyNames() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -750,7 +750,7 @@ css::uno::Sequence< OUString > RegistryKey::getKeyNames() } sal_Bool RegistryKey::createLink(OUString const &, OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); @@ -758,14 +758,14 @@ sal_Bool RegistryKey::createLink(OUString const &, OUString const &) } void RegistryKey::deleteLink(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + 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) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); @@ -773,7 +773,7 @@ OUString RegistryKey::getLinkTarget(OUString const &) } OUString RegistryKey::getResolvedName(OUString const & aKeyName) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) + 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 67d0e0f6d53f..a8c76b782dab 100644 --- a/configmgr/source/readonlyaccess.cxx +++ b/configmgr/source/readonlyaccess.cxx @@ -56,29 +56,29 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return read_only_access::getImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException) + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { 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); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getByHierarchicalName( OUString const & aName) throw ( - css::container::NoSuchElementException, css::uno::RuntimeException) + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { return getRoot()->getByHierarchicalName(aName); } virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return getRoot()->hasByHierarchicalName(aName); } rtl::Reference< RootAccess > getRoot(); @@ -90,7 +90,7 @@ private: }; void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException) + 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 d9352892411e..bce076b2c2e7 100644 --- a/configmgr/source/readwriteaccess.cxx +++ b/configmgr/source/readwriteaccess.cxx @@ -58,29 +58,29 @@ private: virtual ~Service() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return read_write_access::getImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException) + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { 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); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception); virtual css::uno::Any SAL_CALL getByHierarchicalName( OUString const & aName) throw ( - css::container::NoSuchElementException, css::uno::RuntimeException) + css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { return getRoot()->getByHierarchicalName(aName); } virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return getRoot()->hasByHierarchicalName(aName); } virtual void SAL_CALL replaceByHierarchicalName( @@ -88,19 +88,19 @@ private: throw ( css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { getRoot()->replaceByHierarchicalName(aName, aElement); } virtual void SAL_CALL commitChanges() - throw (css::lang::WrappedTargetException, css::uno::RuntimeException) + throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { getRoot()->commitChanges(); } virtual sal_Bool SAL_CALL hasPendingChanges() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return getRoot()->hasPendingChanges(); } virtual css::util::ChangesSet SAL_CALL getPendingChanges() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return getRoot()->getPendingChanges(); } rtl::Reference< RootAccess > getRoot(); @@ -112,7 +112,7 @@ private: }; void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException) + 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 59b2bbd12051..9ccf8fcb5fb3 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -120,7 +120,7 @@ void RootAccess::setAlive(bool b) { void RootAccess::addChangesListener( css::uno::Reference< css::util::XChangesListener > const & aListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); { @@ -143,7 +143,7 @@ void RootAccess::addChangesListener( void RootAccess::removeChangesListener( css::uno::Reference< css::util::XChangesListener > const & aListener) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -183,7 +183,7 @@ void RootAccess::commitChanges() bc.send(); } -sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) { +sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_UPDATE)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -194,7 +194,7 @@ sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException) { } css::util::ChangesSet RootAccess::getPendingChanges() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_UPDATE)); osl::MutexGuard g(*lock_); @@ -296,7 +296,7 @@ void RootAccess::clearListeners() throw() { } css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -318,7 +318,7 @@ css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType) } OUString RootAccess::getImplementationName() - throw (css::uno::RuntimeException) + 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 25d13082ed6d..f87d1b533721 100644 --- a/configmgr/source/rootaccess.hxx +++ b/configmgr/source/rootaccess.hxx @@ -82,12 +82,12 @@ public: virtual void SAL_CALL addChangesListener( com::sun::star::uno::Reference< com::sun::star::util::XChangesListener > const & aListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeChangesListener( com::sun::star::uno::Reference< com::sun::star::util::XChangesListener > const & aListener) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL commitChanges() throw ( @@ -96,10 +96,10 @@ public: std::exception); virtual sal_Bool SAL_CALL hasPendingChanges() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::util::ChangesSet SAL_CALL getPendingChanges() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: virtual ~RootAccess(); @@ -130,10 +130,10 @@ private: virtual com::sun::star::uno::Any SAL_CALL queryInterface( com::sun::star::uno::Type const & aType) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); typedef std::multiset< diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx index ac53c94c4c52..7e6d982ca6e3 100644 --- a/configmgr/source/update.cxx +++ b/configmgr/source/update.cxx @@ -74,7 +74,7 @@ private: virtual void SAL_CALL insertExtensionXcsFile( sal_Bool shared, OUString const & fileUri) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual void SAL_CALL insertExtensionXcuFile( sal_Bool shared, OUString const & fileUri) @@ -89,7 +89,7 @@ private: OUString const & fileUri, css::uno::Sequence< OUString > const & includedPaths, css::uno::Sequence< OUString > const & excludedPaths) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); boost::shared_ptr lock_; css::uno::Reference< css::uno::XComponentContext > context_; @@ -97,7 +97,7 @@ private: void Service::insertExtensionXcsFile( sal_Bool shared, OUString const & fileUri) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(*lock_); Components::getSingleton(context_).insertExtensionXcsFile(shared, fileUri); @@ -139,7 +139,7 @@ void Service::insertModificationXcuFile( OUString const & fileUri, css::uno::Sequence< OUString > const & includedPaths, css::uno::Sequence< OUString > const & excludedPaths) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { Broadcaster bc; { diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx index 081f18e8dc77..28a636d8b137 100644 --- a/connectivity/source/commontools/BlobHelper.cxx +++ b/connectivity/source/commontools/BlobHelper.cxx @@ -29,19 +29,19 @@ BlobHelper::BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val) { } -::sal_Int64 SAL_CALL BlobHelper::length( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::sal_Int64 SAL_CALL BlobHelper::length( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_aValue.getLength(); } -::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { if ( sal_Int32(pos + _length) > m_aValue.getLength() ) throw ::com::sun::star::sdbc::SQLException(); return ::com::sun::star::uno::Sequence< ::sal_Int8 >(m_aValue.getConstArray() + sal_Int32(pos),_length); } -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return new ::comphelper::SequenceInputStream(m_aValue); } @@ -53,13 +53,13 @@ BlobHelper::BlobHelper(const ::com::sun::star::uno::Sequence< sal_Int8 >& _val) SAL_WNOUNREACHABLE_CODE_PUSH -::sal_Int64 SAL_CALL BlobHelper::position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::sal_Int64 SAL_CALL BlobHelper::position( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this ); return 0; } -::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", *this ); return 0; diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index f607209f8d61..a3529b4a63a9 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 (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" ); } -::com::sun::star::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { // first collect the services which are supported by our aggregate Sequence< OUString > aSupported; @@ -132,19 +132,19 @@ OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (::com::su } -sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType ) throw (RuntimeException) +Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { 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 (::com::sun::star::uno::RuntimeException) +Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::comphelper::concatSequences( OConnection_BASE::getTypes(), @@ -153,7 +153,7 @@ Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) throw (::com::sun::st } // com::sun::star::lang::XUnoTunnel -sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException) +sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) { if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast< sal_Int64 >( this ); diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 162531ceb710..13f38d27122d 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) +Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), @@ -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) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -191,73 +191,73 @@ void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com: ::dbtools::throwInvalidIndexException(*this); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { return 0; } -sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -269,43 +269,43 @@ 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*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex).makeAny(); } -sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } @@ -313,20 +313,20 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) -::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue(columnIndex); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) { return m_bEOF; } @@ -334,13 +334,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException SAL_WNOUNREACHABLE_CODE_PUSH -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; @@ -349,18 +349,18 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, Run SAL_WNOUNREACHABLE_CODE_POP -void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); } -void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); } -void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -373,32 +373,32 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE SAL_WNOUNREACHABLE_CODE_PUSH -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; @@ -407,7 +407,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, R SAL_WNOUNREACHABLE_CODE_POP -Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) { return m_aStatement.get(); } @@ -415,19 +415,19 @@ Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) th SAL_WNOUNREACHABLE_CODE_PUSH -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionSequenceException(*this); return sal_False; @@ -437,13 +437,13 @@ SAL_WNOUNREACHABLE_CODE_POP -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) { return m_bBOF; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -472,7 +472,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( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -484,20 +484,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) +void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) { } -void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException, std::exception) { } -void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { } -Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { return Any(); } @@ -642,7 +642,7 @@ void ODatabaseMetaDataResultSet::setImportedKeysMap() m_xMetaData = pMetaData; } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException) +Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -751,7 +751,7 @@ ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue() return aValueRef; } -void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException, std::exception) { if ( _aArguments.getLength() == 2 ) { @@ -861,17 +861,17 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA return aSNS; } - OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx index fe5c9614d6b5..cd15132120b6 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) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) { return m_mColumns.size(); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCaseSensitive(); return sal_True; } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCurrency(); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isAutoIncrement(); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSigned(); return sal_False; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSearchable(); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { return isDefinitelyWritable(column); } diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index 0ea7c652ddc1..76251af1cfee 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.cxx @@ -31,7 +31,7 @@ namespace connectivity ParameterSubstitution::ParameterSubstitution(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext) { } - void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException) + void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); @@ -45,17 +45,17 @@ namespace connectivity return OUString("org.openoffice.comp.helper.ParameterSubstitution"); } - OUString SAL_CALL ParameterSubstitution::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL ParameterSubstitution::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -73,7 +73,7 @@ namespace connectivity return *(new ParameterSubstitution(_xContext)); } - OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) { OUString sRet = _sText; uno::Reference< sdbc::XConnection > xConnection = m_xConnection; @@ -100,12 +100,12 @@ namespace connectivity return sRet; } - OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (::com::sun::star::uno::RuntimeException) + OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return _sText; } - OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException) + OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) { throw container::NoSuchElementException(); } diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx index 94e7d431b47b..ab74964f0cae 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 ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL OMetaConnection::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException, std::exception) { 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 c63667eee210..0a9071b89874 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) +Sequence< PropertyValue > SAL_CALL ODatabaseMetaDataBase::getConnectionInfo( ) throw (RuntimeException, std::exception) { return m_aConnectionInfo; } -void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ ) throw(RuntimeException) +void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ ) throw(RuntimeException, std::exception) { // cut off all references to the connection m_xConnection.clear(); m_xListenerHelper.clear(); } -Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQLException, RuntimeException, std::exception) { ::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) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getImportedKeys( - const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getPrimaryKeys( - const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception) { 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) + sal_Bool /*unique*/, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException, std::exception) { 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) + sal_Bool /*nullable*/ ) throw(SQLException, RuntimeException, std::exception) { 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) + const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/ ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } -Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection( ) throw(SQLException, RuntimeException, std::exception) { return m_xConnection; } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedureColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, - const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException) + const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedures( const Any& /*catalog*/, const OUString& /*schemaPattern*/, - const OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException) + const OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getVersionColumns( - const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns ); } -Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas( ) throw(SQLException, RuntimeException, std::exception) { 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) + const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTablePrivileges( - const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/) throw(SQLException, RuntimeException) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } -Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs ); } -OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw)); } -OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_supportsCatalogsInTableDefinitions,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_supportsSchemasInTableDefinitions,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_supportsCatalogsInDataManipulation,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_supportsSchemasInDataManipulation,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_supportsAlterTableWithAddColumn,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_supportsAlterTableWithDropColumn,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw)); } -sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_MaxStatements,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw)); } -sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_MaxTablesInSelect,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return callImplMethod(m_storesMixedCaseQuotedIdentifiers,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw)); } diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx index 6906e57d5c10..9fc99fc649ea 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) +sal_Bool SAL_CALL OResultSetPrivileges::next( ) throw(SQLException, RuntimeException, std::exception) { ::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 fd8215fbfdcd..2fe6c6235160 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -61,17 +61,17 @@ protected: virtual ~OTableContainerListener(){} public: OTableContainerListener(OTableHelper* _pComponent) : m_pComponent(_pComponent){} - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& /*Event*/ ) throw (RuntimeException) + virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) { } - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException) + virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) { OUString sName; Event.Accessor >>= sName; if ( m_aRefNames.find(sName) != m_aRefNames.end() ) m_pComponent->refreshKeys(); } - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException) + virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) { OUString sOldComposedName,sNewComposedName; Event.ReplacedElement >>= sOldComposedName; @@ -80,7 +80,7 @@ public: m_pComponent->refreshKeys(); } // XEventListener - virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) throw (RuntimeException) + virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) { } void clear() { m_pComponent = NULL; } @@ -492,7 +492,7 @@ OUString OTableHelper::getRenameStart() const } // XRename -void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException, std::exception) { ::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, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) +void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException, std::exception) { ::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) +OUString SAL_CALL OTableHelper::getName() throw(RuntimeException, std::exception) { OUString sComposedName; sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_False,::dbtools::eInDataManipulation); diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index 8a45b8b99dd7..5da0c9184d0a 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -133,7 +133,7 @@ namespace dbtools } - void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException) + void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception) { if ( _rEvent.PropertyName.equals( getActiveConnectionPropertyName() ) ) { // somebody set a new ActiveConnection @@ -185,7 +185,7 @@ namespace dbtools } - void SAL_CALL OAutoConnectionDisposer::disposing( const EventObject& _rSource ) throw (RuntimeException) + void SAL_CALL OAutoConnectionDisposer::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) { // the rowset is beeing disposed, and nobody has set a new ActiveConnection in the meantime if ( isRowSetListening() ) @@ -213,15 +213,15 @@ namespace dbtools } } - void SAL_CALL OAutoConnectionDisposer::cursorMoved( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL OAutoConnectionDisposer::cursorMoved( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { } - void SAL_CALL OAutoConnectionDisposer::rowChanged( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL OAutoConnectionDisposer::rowChanged( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { } - void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const ::com::sun::star::lang::EventObject& /*event*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { stopRowSetListening(); clearConnection(); diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index f38e86138f2b..e8b68dd46387 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1658,24 +1658,24 @@ namespace OParameterWrapper(const ::std::vector >& _aSet,const Reference& _xSource) : m_aSet(_aSet),m_xSource(_xSource){} private: // ::com::sun::star::container::XElementAccess - virtual Type SAL_CALL getElementType() throw(RuntimeException) + virtual Type SAL_CALL getElementType() throw(RuntimeException, std::exception) { return m_xSource->getElementType(); } - virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException) + virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException, std::exception) { if ( m_aSet.empty() ) return m_xSource->hasElements(); return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0; } // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException) + virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) { 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) + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { if ( m_aSet.empty() ) return m_xSource->getByIndex(Index); diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 48becea7eaba..65cbacf810c7 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -1096,7 +1096,7 @@ namespace dbtools //= OParameterContinuation //==================================================================== - void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw( RuntimeException ) + void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw( RuntimeException, std::exception ) { m_aValues = _rValues; } diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index f8289fe5de2a..8c576807a26a 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -101,7 +101,7 @@ namespace param IMPLEMENT_FORWARD_XINTERFACE2( ParameterWrapper, UnoBase, PropertyBase ) - Sequence< Type > SAL_CALL ParameterWrapper::getTypes( ) throw(RuntimeException) + Sequence< Type > SAL_CALL ParameterWrapper::getTypes( ) throw(RuntimeException, std::exception) { Sequence< Type > aTypes( 4 ); aTypes[ 1 ] = ::getCppuType( static_cast< Reference< XWeak >* >( NULL ) ); @@ -131,7 +131,7 @@ namespace param } - Reference< XPropertySetInfo > ParameterWrapper::getPropertySetInfo() throw( RuntimeException ) + Reference< XPropertySetInfo > ParameterWrapper::getPropertySetInfo() throw( RuntimeException, std::exception ) { return createPropertySetInfo( getInfoHelper() ); } @@ -177,7 +177,7 @@ namespace param } - void ParameterWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception ) + void ParameterWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception, std::exception ) { if ( nHandle == PROPERTY_ID_VALUE ) { @@ -275,7 +275,7 @@ namespace param } - Type SAL_CALL ParameterWrapperContainer::getElementType() throw( RuntimeException ) + Type SAL_CALL ParameterWrapperContainer::getElementType() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -283,7 +283,7 @@ namespace param } - sal_Bool SAL_CALL ParameterWrapperContainer::hasElements() throw( RuntimeException ) + sal_Bool SAL_CALL ParameterWrapperContainer::hasElements() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -291,7 +291,7 @@ namespace param } - sal_Int32 SAL_CALL ParameterWrapperContainer::getCount() throw( RuntimeException ) + sal_Int32 SAL_CALL ParameterWrapperContainer::getCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -299,7 +299,7 @@ namespace param } - Any SAL_CALL ParameterWrapperContainer::getByIndex( sal_Int32 _nIndex ) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) + Any SAL_CALL ParameterWrapperContainer::getByIndex( sal_Int32 _nIndex ) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -311,7 +311,7 @@ namespace param } - Reference< XEnumeration > ParameterWrapperContainer::createEnumeration() throw( RuntimeException ) + Reference< XEnumeration > ParameterWrapperContainer::createEnumeration() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index 869b95e6e5ba..0a316c2b6802 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -188,7 +188,7 @@ Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const return xConnection; } -void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException) +void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException, std::exception) { Reference xConnection(Source.Source,UNO_QUERY); if(xConnection.is()) @@ -300,7 +300,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite return xConnection; } -void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) { if(getTimeoutNodeName() == evt.PropertyName) { diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index 6a4643bc2df0..becc07e5d960 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -139,9 +139,9 @@ namespace connectivity void clear(sal_Bool _bDispose); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception); void invalidatePooledConnections(); }; diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx index 98ec50cc2da3..5241944b5347 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) +Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::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) +Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::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) +Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::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) +OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL OConnectionWeakWrapper::commit( ) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL OConnectionWeakWrapper::rollback( ) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL OConnectionWeakWrapper::isClosed( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_xConnection->isClosed(); } -Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception) { ::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) +OUString SAL_CALL OConnectionWeakWrapper::getCatalog( ) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { ::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< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -202,7 +202,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWr return m_xConnection->getTypeMap(); } -void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException) +void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -212,7 +212,7 @@ void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::s } // XCloseable -void SAL_CALL OConnectionWeakWrapper::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnectionWeakWrapper::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -235,7 +235,7 @@ void OConnectionWeakWrapper::disposing() IMPLEMENT_FORWARD_XINTERFACE2(OConnectionWeakWrapper,OConnectionWeakWrapper_BASE,OConnectionWrapper) #else IMPLEMENT_FORWARD_REFCOUNT( OConnectionWeakWrapper, OConnectionWeakWrapper_BASE ) \ -::com::sun::star::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException) \ +::com::sun::star::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::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 89bac01b2f0e..886b671ee3e7 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -53,26 +53,26 @@ namespace connectivity DECLARE_XINTERFACE( ) // XConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } #endif // _CONNECTIVITY_ZCONNECTIONWEAKWRAPPER_HXX_ diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx index 3c3ba05db709..6d8a49777fe1 100644 --- a/connectivity/source/cpool/ZDriverWrapper.cxx +++ b/connectivity/source/cpool/ZDriverWrapper.cxx @@ -72,14 +72,14 @@ namespace connectivity } - Any SAL_CALL ODriverWrapper::queryInterface( const Type& _rType ) throw (RuntimeException) + Any SAL_CALL ODriverWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) { 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) + Reference< XConnection > SAL_CALL ODriverWrapper::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) { Reference< XConnection > xConnection; if (m_pConnectionPool) @@ -92,13 +92,13 @@ namespace connectivity } - sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException) + sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception) { return m_xDriver.is() && m_xDriver->acceptsURL(url); } - Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) { Sequence< DriverPropertyInfo > aInfo; if (m_xDriver.is()) @@ -107,13 +107,13 @@ namespace connectivity } - sal_Int32 SAL_CALL ODriverWrapper::getMajorVersion( ) throw (RuntimeException) + sal_Int32 SAL_CALL ODriverWrapper::getMajorVersion( ) throw (RuntimeException, std::exception) { return m_xDriver.is() ? m_xDriver->getMajorVersion() : 0; } - sal_Int32 SAL_CALL ODriverWrapper::getMinorVersion( ) throw (RuntimeException) + sal_Int32 SAL_CALL ODriverWrapper::getMinorVersion( ) throw (RuntimeException, std::exception) { return m_xDriver.is() ? m_xDriver->getMinorVersion() : 0; } diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx index a4ffdc93e9ff..21eef7405e43 100644 --- a/connectivity/source/cpool/ZDriverWrapper.hxx +++ b/connectivity/source/cpool/ZDriverWrapper.hxx @@ -59,17 +59,17 @@ namespace connectivity // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); protected: /// dtor virtual ~ODriverWrapper(); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; //........................................................................ diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 5df6034fb2c6..9d345b9fe69a 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -100,12 +100,12 @@ OPoolCollection::~OPoolCollection() clearConnectionPools(sal_False); } -Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException, std::exception) { return getConnectionWithInfo(_rURL,Sequence< PropertyValue >()); } -Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); Reference< XConnection > xConnection; @@ -125,31 +125,31 @@ Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const return xConnection; } -void SAL_CALL OPoolCollection::setLoginTimeout( sal_Int32 seconds ) throw(RuntimeException) +void SAL_CALL OPoolCollection::setLoginTimeout( sal_Int32 seconds ) throw(RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); m_xManager->setLoginTimeout(seconds); } -sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout( ) throw(RuntimeException) +sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout( ) throw(RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); return m_xManager->getLoginTimeout(); } -OUString SAL_CALL OPoolCollection::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OPoolCollection::getImplementationName( ) throw(RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); return getImplementationName_Static(); } -sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -174,7 +174,7 @@ Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( return aSupported; } -Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL ) throw(RuntimeException) +Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL ) throw(RuntimeException, std::exception) { // returns the original driver when no connection pooling is enabled else it returns the proxy MutexGuard aGuard(m_aMutex); @@ -411,16 +411,16 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference& _xTreeNode)throw(); // XDriverManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::uno::RuntimeException, std::exception); //XDriverAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static methods static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL CreateInstance(const::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -130,13 +130,13 @@ namespace connectivity static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; } #endif // CONNECTIVITY_POOLCOLLECTION_HXX diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index 93469c7a481f..2888e88ebc2e 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.cxx @@ -54,13 +54,13 @@ m_xComponent.clear(); } // XEventListener -void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) +void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) { m_xComponent.clear(); } //XPooledConnection -Reference< XConnection > OPooledConnection::getConnection() throw(SQLException, RuntimeException) +Reference< XConnection > OPooledConnection::getConnection() throw(SQLException, RuntimeException, std::exception) { if(!m_xComponent.is() && m_xRealConnection.is()) { diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx index 73a225216a5b..b587f5bbaea1 100644 --- a/connectivity/source/cpool/ZPooledConnection.hxx +++ b/connectivity/source/cpool/ZPooledConnection.hxx @@ -49,10 +49,10 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory); //XPooledConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 2889096177b8..c3a7be9a7d75 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -196,7 +196,7 @@ IMPLEMENT_SERVICE_INFO(OCalcConnection, "com.sun.star.sdbc.drivers.calc.Connecti -Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::getMetaData" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -231,7 +231,7 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S -Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::createStatement" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -246,7 +246,7 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLE Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::prepareStatement" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -263,7 +263,7 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::prepareCall" ); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 6cade720740a..8048e88cf364 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -143,7 +143,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) + const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getColumns" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -239,7 +239,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( -OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getURL" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -249,7 +249,7 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxBinaryLiteralLength" ); return SAL_MAX_INT32; @@ -257,25 +257,25 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQ -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxCharLiteralLength" ); return SAL_MAX_INT32; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxColumnNameLength" ); return SAL_MAX_INT32; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxColumnsInIndex" ); return 1; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxColumnsInTable" ); return 256; @@ -358,7 +358,7 @@ static sal_Bool lcl_IsUnnamed( const Reference& xRanges, const Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const Sequence< OUString >& types ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getTables" ); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index 5d117678087a..6a8e91243265 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -42,7 +42,7 @@ OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) return OUString("com.sun.star.comp.sdbc.calc.ODriver"); } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } @@ -59,7 +59,7 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) } Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, - const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) + const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -77,12 +77,12 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, } sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) + 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) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) { if ( !acceptsURL(url) ) { diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index 7038cb3532a8..9d50f67ef48b 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, ::getBooleanCppuType()); } -OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException) +OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) { return OUString("com.sun.star.sdbcx.calc.ResultSet"); } -Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException) +Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OResultSet::queryInterface(rType); return aRet.hasValue() ? aRet : OCalcResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OCalcResultSet::getTypes( ) throw( RuntimeException) + Sequence< Type > SAL_CALL OCalcResultSet::getTypes( ) throw( RuntimeException, std::exception) { return ::comphelper::concatSequences(OResultSet::getTypes(),OCalcResultSet_BASE::getTypes()); } // XRowLocate -Any SAL_CALL OCalcResultSet::getBookmark( ) throw( SQLException, RuntimeException) +Any SAL_CALL OCalcResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) { ::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),sal_True); } -sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) { ::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) +sal_Int32 SAL_CALL OCalcResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) { return (lhs == rhs) ? 0 : 2; } -sal_Bool SAL_CALL OCalcResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL OCalcResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) { ::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) +Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -166,7 +166,7 @@ void SAL_CALL OCalcResultSet::release() throw() OCalcResultSet_BASE2::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index ec38222882ce..718fe086d21d 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -663,7 +663,7 @@ void SAL_CALL OCalcTable::disposing(void) } -Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException, std::exception) { //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getTypes" ); Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); @@ -688,7 +688,7 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException) } -Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { if( rType == ::getCppuType((const Reference*)0) || rType == ::getCppuType((const Reference*)0) || @@ -720,7 +720,7 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId() // com::sun::star::lang::XUnoTunnel -sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getSomething" ); return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx index 2fd71ab384ba..c9748ba3e096 100644 --- a/connectivity/source/drivers/dbase/DConnection.cxx +++ b/connectivity/source/drivers/dbase/DConnection.cxx @@ -58,7 +58,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) +Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -87,7 +87,7 @@ Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData( ) throw( return xTab; } -Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -98,7 +98,7 @@ Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) throw(SQL return xReturn; } -Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -111,7 +111,7 @@ Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( con return pStmt; } -Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index 13b7b96d3f3c..601e1854bbf1 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -155,7 +155,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) + const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getColumns" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -247,7 +247,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) + sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getIndexInfo" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -322,56 +322,56 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( return xRef; } -OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getURL" ); ::osl::MutexGuard aGuard( m_aMutex ); return OUString("sdbc:dbase:") + m_pConnection->getURL(); } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxBinaryLiteralLength" ); return SAL_MAX_INT32; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxCharLiteralLength" ); return 254; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxColumnNameLength" ); return 10; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxColumnsInIndex" ); return 1; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxColumnsInTable" ); return 128; } -sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn" ); return sal_True; } -sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn" ); return sal_False; } -sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::isReadOnly" ); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index 993b7abf7fd3..f045cd4a56de 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -41,7 +41,7 @@ OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } @@ -52,7 +52,7 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } -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 ) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException, std::exception) { return url.startsWith("sdbc:dbase:"); } -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*/ ) throw(SQLException, RuntimeException, std::exception) { if ( acceptsURL(url) ) { diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 5286072b7665..8c314f391bfd 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -124,7 +124,7 @@ Sequence< sal_Int8 > ODbaseIndex::getUnoTunnelImplementationId() // XUnoTunnel -sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index 768f210e9120..94fd6103ce99 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -47,12 +47,12 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, ::getBooleanCppuType()); } -OUString SAL_CALL ODbaseResultSet::getImplementationName( ) throw ( RuntimeException) +OUString SAL_CALL ODbaseResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) { return OUString("com.sun.star.sdbcx.dbase.ResultSet"); } -Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) throw( RuntimeException) +Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -60,25 +60,25 @@ Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) thro return aSupported; } -sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = ODbaseResultSet_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet::queryInterface(rType); } - Sequence< Type > SAL_CALL ODbaseResultSet::getTypes( ) throw( RuntimeException) + Sequence< Type > SAL_CALL ODbaseResultSet::getTypes( ) throw( RuntimeException, std::exception) { return ::comphelper::concatSequences(OResultSet::getTypes(),ODbaseResultSet_BASE::getTypes()); } // XRowLocate -Any SAL_CALL ODbaseResultSet::getBookmark( ) throw( SQLException, RuntimeException) +Any SAL_CALL ODbaseResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -87,7 +87,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) +sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -98,7 +98,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) throw( return m_pTable ? Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),sal_True) : sal_False; } -sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -112,7 +112,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) +sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) { sal_Int32 nFirst(0),nSecond(0),nResult(0); if ( !( lhs >>= nFirst ) || !( rhs >>= nSecond ) ) @@ -134,12 +134,12 @@ sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& return nResult; } -sal_Bool SAL_CALL ODbaseResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL ODbaseResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -149,7 +149,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) +Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -210,7 +210,7 @@ void SAL_CALL ODbaseResultSet::release() throw() ODbaseResultSet_BASE2::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 5bdb87d10b6d..2a2a332e8661 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -718,7 +718,7 @@ void SAL_CALL ODbaseTable::disposing(void) m_aColumns = NULL; } -Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getTypes" ); Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); @@ -741,7 +741,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException) } -Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::queryInterface" ); if( rType == ::getCppuType((const Reference*)0) || @@ -771,7 +771,7 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId() // com::sun::star::lang::XUnoTunnel -sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getSomething" ); return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -2137,7 +2137,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_Size& rBlockN // XAlterTable -void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -2150,7 +2150,7 @@ void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Ref alterColumn(m_pColumns->findColumn(colName)-1,descriptor,xOldColumn); } -void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) +void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::alterColumnByIndex" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -2278,7 +2278,7 @@ Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const return getConnection()->getMetaData(); } -void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::rename" ); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 3d8ed8232564..ef88e047297c 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -121,7 +121,7 @@ void ODbaseTables::dropObject(sal_Int32 _nPos,const OUString _sElementName) } } -Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { 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 6fdd864871df..edfab2275fcc 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.cxx @@ -64,7 +64,7 @@ void OEvoabCatalog::refreshTables() m_pTables = new OEvoabTables(m_xMetaData,*this,m_aMutex,aVector); } // XTablesSupplier -Reference< XNameAccess > SAL_CALL OEvoabCatalog::getTables( ) throw(RuntimeException) +Reference< XNameAccess > SAL_CALL OEvoabCatalog::getTables( ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index b991c8df52e4..e7346e6cc78b 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.hxx @@ -40,7 +40,7 @@ namespace connectivity virtual void refreshUsers() {} // XTablesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( - ) throw(::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 3846fca5d041..fd522c0f0f88 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -124,13 +124,13 @@ void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyVa } -OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) { // 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) +Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -158,7 +158,7 @@ Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData( ) throw( return xTab; } -Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -170,7 +170,7 @@ Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) throw(SQL return xStmt; } -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -183,12 +183,12 @@ Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( con return xStmt; } -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) throw( SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) throw( SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; } -sal_Bool SAL_CALL OEvoabConnection::isClosed( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed; @@ -196,7 +196,7 @@ sal_Bool SAL_CALL OEvoabConnection::isClosed( ) throw(SQLException, RuntimeExce // XCloseable -void SAL_CALL OEvoabConnection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::close( ) throw(SQLException, RuntimeException, std::exception) { { // we just dispose us ::osl::MutexGuard aGuard( m_aMutex ); @@ -207,11 +207,11 @@ void SAL_CALL OEvoabConnection::close( ) throw(SQLException, RuntimeException) // XWarningsSupplier -Any SAL_CALL OEvoabConnection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OEvoabConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { return m_aWarnings.getWarnings(); } -void SAL_CALL OEvoabConnection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { m_aWarnings.clearWarnings(); } @@ -226,53 +226,53 @@ void OEvoabConnection::disposing() } // -------------------------------- stubbed methods ------------------------------------------------ -void SAL_CALL OEvoabConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setAutoCommit", *this ); } -sal_Bool SAL_CALL OEvoabConnection::getAutoCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -void SAL_CALL OEvoabConnection::commit( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::commit( ) throw(SQLException, RuntimeException, std::exception) { } -void SAL_CALL OEvoabConnection::rollback( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) { } -void SAL_CALL OEvoabConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setReadOnly", *this ); } -sal_Bool SAL_CALL OEvoabConnection::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } -OUString SAL_CALL OEvoabConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setTransactionIsolation", *this ); } -sal_Int32 SAL_CALL OEvoabConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { return TransactionIsolation::NONE; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::getTypeMap", *this ); return NULL; } -void SAL_CALL OEvoabConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this ); } diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 772bfce483b1..7c529abffc38 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -85,30 +85,30 @@ namespace connectivity // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 76039c62c77a..724b478b48f4 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -323,47 +323,47 @@ OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) return OUString(); } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } @@ -373,7 +373,7 @@ sal_Int32 OEvoabDatabaseMetaData::impl_getMaxStatements_throw( ) return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } @@ -385,17 +385,17 @@ sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -405,17 +405,17 @@ sal_Bool OEvoabDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -430,17 +430,17 @@ sal_Bool OEvoabDatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return sal_False; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aVal; return aVal; @@ -453,13 +453,13 @@ OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return aVal; } -OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) { OUString aVal; return aVal; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -470,57 +470,57 @@ sal_Bool OEvoabDatabaseMetaData::impl_isCatalogAtStart_throw( ) return bValue; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -530,22 +530,22 @@ sal_Bool OEvoabDatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; // should be supported at least } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -560,7 +560,7 @@ sal_Bool OEvoabDatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -570,145 +570,145 @@ sal_Bool OEvoabDatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) { // We allow you to select from any table. return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { // For now definitely read-only, no support for update/delete return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) { // todo add Support for this. return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -719,271 +719,271 @@ sal_Bool OEvoabDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) { return OUString( "1" ); } -OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) { return OUString( "0" ); } -OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) { return 1; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) { return 0; } -OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -993,7 +993,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) +Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) { /* Dont need to change as evoab driver supports only table */ @@ -1072,7 +1072,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) + const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -1094,7 +1094,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) + const OUString& /*tableNamePattern*/, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1226,7 +1226,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) +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) { ::dbtools::throwFeatureNotImplementedException( "XDatabaseMetaDaza::getUDTs", *this ); return NULL; diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 87ded8659ef2..017393191057 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - - virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index b0f629f0cd19..8cc957e352d9 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -96,17 +96,17 @@ Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (Ru return aSNS; } -OUString SAL_CALL OEvoabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OEvoabDriver::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } -sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -117,7 +117,7 @@ Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(R return *(new OEvoabDriver(_rxFactory)); } -Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -135,13 +135,13 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, co } sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) + 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) +Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) { if ( ! acceptsURL(url) ) { @@ -155,12 +155,12 @@ Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUS } -sal_Int32 SAL_CALL OEvoabDriver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL OEvoabDriver::getMajorVersion( ) throw(RuntimeException, std::exception) { return 1; } -sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException, std::exception) { return 0; } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index a5ed2a2ca8e6..0d44aa3fc828 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -66,17 +66,17 @@ namespace connectivity static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index d73229b9202b..30fdfdf9dbfd 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -83,7 +83,7 @@ void SAL_CALL OEvoabPreparedStatement::release() throw() } -Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OCommonStatement::queryInterface(rType); if(!aRet.hasValue()) @@ -91,13 +91,13 @@ Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw return aRet; } -Sequence< Type > SAL_CALL OEvoabPreparedStatement::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OEvoabPreparedStatement::getTypes( ) throw(RuntimeException, std::exception) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -108,7 +108,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData( } -void SAL_CALL OEvoabPreparedStatement::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -126,7 +126,7 @@ void SAL_CALL OEvoabPreparedStatement::close( ) throw(SQLException, RuntimeExce } -sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -136,7 +136,7 @@ sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException, Runti } -sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -145,13 +145,13 @@ sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) throw(SQLException } -void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setString", *this ); } -Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -160,7 +160,7 @@ Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection( ) thr } -Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -169,104 +169,104 @@ Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery( ) throw } -void SAL_CALL OEvoabPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setBoolean", *this ); } -void SAL_CALL OEvoabPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setByte", *this ); } -void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setDate", *this ); } -void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setTime", *this ); } -void SAL_CALL OEvoabPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setTimestamp", *this ); } -void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setDouble", *this ); } -void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setFloat", *this ); } -void SAL_CALL OEvoabPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setInt", *this ); } -void SAL_CALL OEvoabPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setLong", *this ); } -void SAL_CALL OEvoabPreparedStatement::setNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setNull", *this ); } -void SAL_CALL OEvoabPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setClob", *this ); } -void SAL_CALL OEvoabPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setBlob", *this ); } -void SAL_CALL OEvoabPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setArray", *this ); } -void SAL_CALL OEvoabPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setRef", *this ); } -void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setObjectWithInfo", *this ); } -void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setObjectNull", *this ); } -void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -279,46 +279,46 @@ void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, cons } -void SAL_CALL OEvoabPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setShort", *this ); } -void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setBytes", *this ); } -void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setCharacterStream", *this ); } -void SAL_CALL OEvoabPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::setBinaryStream", *this ); } -void SAL_CALL OEvoabPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) { } -Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::getResultSet( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::getResultSet( ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -sal_Int32 SAL_CALL OEvoabPreparedStatement::getUpdateCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabPreparedStatement::getUpdateCount( ) throw(SQLException, RuntimeException, std::exception) { return 0; } -sal_Bool SAL_CALL OEvoabPreparedStatement::getMoreResults( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabPreparedStatement::getMoreResults( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 468b8130571b..df8aece04a2a 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 ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPreparedStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XMultipleResults - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 4ad700b1308c..a79eb5bdb62a 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -64,19 +64,19 @@ using namespace com::sun::star::io; namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition; -OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \ +OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) \ { return OUString("com.sun.star.sdbcx.evoab.ResultSet"); } - Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) { Sequence< OUString > aSupported(1); aSupported[0] = "com.sun.star.sdbc.ResultSet"; return aSupported; } -sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -720,7 +720,7 @@ void OEvoabResultSet::disposing(void) m_xMetaData.clear(); } -Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { 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) +Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException, std::exception) { 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) +OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -762,7 +762,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) +sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -779,103 +779,103 @@ sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLE return bResult ? sal_True : sal_False; } -sal_Int64 SAL_CALL OEvoabResultSet::getLong( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL OEvoabResultSet::getLong( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getLong", *this ); return sal_Int64(); } -Reference< XArray > SAL_CALL OEvoabResultSet::getArray( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL OEvoabResultSet::getArray( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getArray", *this ); return NULL; } -Reference< XClob > SAL_CALL OEvoabResultSet::getClob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL OEvoabResultSet::getClob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getClob", *this ); return NULL; } -Reference< XBlob > SAL_CALL OEvoabResultSet::getBlob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL OEvoabResultSet::getBlob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getBlob", *this ); return NULL; } -Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getRef", *this ); return NULL; } -Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getObject", *this ); return Any(); } -sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getShort", *this ); return 0; } -::com::sun::star::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +::com::sun::star::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getTime", *this ); return ::com::sun::star::util::Time(); } -util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getTimestamp", *this ); return ::com::sun::star::util::DateTime(); } -Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getBinaryStream", *this ); return NULL; } -Reference< XInputStream > SAL_CALL OEvoabResultSet::getCharacterStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL OEvoabResultSet::getCharacterStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getCharacterStream", *this ); return NULL; } -sal_Int8 SAL_CALL OEvoabResultSet::getByte( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL OEvoabResultSet::getByte( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getByte", *this ); return 0; } -Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getBytes", *this ); return Sequence< sal_Int8 >(); } -::com::sun::star::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +::com::sun::star::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getDate", *this ); return ::com::sun::star::util::Date(); } -double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getDouble", *this ); return 0; } -float SAL_CALL OEvoabResultSet::getFloat( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +float SAL_CALL OEvoabResultSet::getFloat( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getFloat", *this ); return 0; } -sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getInt", *this ); return 0; @@ -884,7 +884,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQL // XResultSetMetaDataSupplier Interface -Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -897,7 +897,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData( ) throw( // XResultSet Interface -sal_Bool SAL_CALL OEvoabResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::next( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -909,7 +909,7 @@ sal_Bool SAL_CALL OEvoabResultSet::next( ) throw(SQLException, RuntimeException return false; } -sal_Bool SAL_CALL OEvoabResultSet::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -917,7 +917,7 @@ sal_Bool SAL_CALL OEvoabResultSet::wasNull( ) throw(SQLException, RuntimeExcept return m_bWasNull; } -sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -925,7 +925,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst( ) throw(SQLException, Runtime return m_nIndex < 0; } -sal_Int32 SAL_CALL OEvoabResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -933,7 +933,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::getRow( ) throw(SQLException, RuntimeExcept return m_nIndex; } -sal_Bool SAL_CALL OEvoabResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -941,7 +941,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isAfterLast( ) throw(SQLException, RuntimeEx return m_nIndex >= m_nLength; } -sal_Bool SAL_CALL OEvoabResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -949,7 +949,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isFirst( ) throw(SQLException, RuntimeExcept return m_nIndex == 0; } -sal_Bool SAL_CALL OEvoabResultSet::isLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -957,7 +957,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isLast( ) throw(SQLException, RuntimeExcepti return m_nIndex == m_nLength - 1; } -void SAL_CALL OEvoabResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -965,7 +965,7 @@ void SAL_CALL OEvoabResultSet::beforeFirst( ) throw(SQLException, RuntimeExcept m_nIndex = -1; } -void SAL_CALL OEvoabResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -974,7 +974,7 @@ void SAL_CALL OEvoabResultSet::afterLast( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OEvoabResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::first( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -984,7 +984,7 @@ sal_Bool SAL_CALL OEvoabResultSet::first( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OEvoabResultSet::last( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::last( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -993,7 +993,7 @@ sal_Bool SAL_CALL OEvoabResultSet::last( ) throw(SQLException, RuntimeException return true; } -sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1005,7 +1005,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) +sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1018,7 +1018,7 @@ sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException, return false; } -sal_Bool SAL_CALL OEvoabResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1031,7 +1031,7 @@ sal_Bool SAL_CALL OEvoabResultSet::previous( ) throw(SQLException, RuntimeExcep return false; } -Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1040,7 +1040,7 @@ Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement( ) throw(SQLExce } -sal_Bool SAL_CALL OEvoabResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1048,7 +1048,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowDeleted( ) throw(SQLException, RuntimeExc return sal_False; } -sal_Bool SAL_CALL OEvoabResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1056,7 +1056,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowInserted( ) throw(SQLException, RuntimeEx return sal_False; } -sal_Bool SAL_CALL OEvoabResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OEvoabResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1064,7 +1064,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowUpdated( ) throw(SQLException, RuntimeExc return sal_False; } -void SAL_CALL OEvoabResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1073,7 +1073,7 @@ void SAL_CALL OEvoabResultSet::refreshRow( ) throw(SQLException, RuntimeExcepti // XCancellable -void SAL_CALL OEvoabResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL OEvoabResultSet::cancel( ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1082,7 +1082,7 @@ void SAL_CALL OEvoabResultSet::cancel( ) throw(RuntimeException) } //XCloseable -void SAL_CALL OEvoabResultSet::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabResultSet::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1094,20 +1094,20 @@ void SAL_CALL OEvoabResultSet::close( ) throw(SQLException, RuntimeException) // XWarningsSupplier -void SAL_CALL OEvoabResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OEvoabResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OEvoabResultSet::clearWarnings" ); m_aWarnings.clearWarnings(); } -Any SAL_CALL OEvoabResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OEvoabResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OEvoabResultSet::getWarnings" ); return m_aWarnings.getWarnings(); } //XColumnLocate Interface -sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1154,7 +1154,7 @@ void SAL_CALL OEvoabResultSet::release() throw() } ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL -OEvoabResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +OEvoabResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 4b8bf638d8d7..b99487b3831f 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -129,64 +129,64 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 535b2c4f6f53..f40cba6a3264 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -64,45 +64,45 @@ void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference () throw() { return this; } - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 15332b510912..c2001a14a65b 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -115,7 +115,7 @@ void OCommonStatement::disposing() OCommonStatement_IBase::disposing(); } -Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OCommonStatement_IBase::queryInterface(rType); if(!aRet.hasValue()) @@ -123,7 +123,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim return aRet; } -Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), @@ -141,7 +141,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException) //} -void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -493,7 +493,7 @@ void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData -Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -503,7 +503,7 @@ Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLExcepti } -Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -513,7 +513,7 @@ Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -593,7 +593,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUStrin } -Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } @@ -611,7 +611,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) +sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -621,7 +621,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException } -Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -630,7 +630,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql } -sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) { ::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 4529aae671e1..0ad25399091f 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -201,19 +201,19 @@ namespace connectivity virtual void SAL_CALL release() throw(); virtual void SAL_CALL acquire() throw(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); protected: /** will return the EBookQuery representing the stamement's WHERE condition, or throw @@ -252,7 +252,7 @@ namespace connectivity } // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); @@ -263,10 +263,10 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) ; }; } } diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index 6687ebd3572f..052145b4ccd3 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.cxx @@ -70,7 +70,7 @@ void OFileCatalog::refreshTables() } -Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::queryInterface" ); if( rType == ::getCppuType((const Reference*)0) || @@ -83,7 +83,7 @@ Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeExc return OFileCatalog_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::getTypes" ); typedef sdbcx::OCatalog OFileCatalog_BASE; diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 9cb00a8dea2a..1309262fd25e 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -216,7 +216,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) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -227,7 +227,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -240,18 +240,18 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return pStmt; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) { throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { return sql; } -void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -259,7 +259,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti m_bAutoCommit = autoCommit; } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -267,22 +267,22 @@ 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( ) throw(SQLException, RuntimeException, std::exception) { } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) { } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -298,7 +298,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 ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -307,7 +307,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, m_bReadOnly = readOnly; } -sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -316,37 +316,37 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return m_bReadOnly; } -void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception) { throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) { throwFeatureNotImplementedException( "XConnection::setTransactionIsolation", *this ); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { return 0; } -Reference< XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { } // XCloseable -void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -357,12 +357,12 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { } @@ -409,7 +409,7 @@ Reference< XDynamicResultSet > OConnection::getDir() const return xContent; } -sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId ) throw (RuntimeException) +sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId ) throw (RuntimeException, std::exception) { 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 d952a4ac161f..0c79b033a99b 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -71,7 +71,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) + const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getColumns" ); SAL_WARN( "connectivity.drivers","Should be overloaded!"); @@ -164,7 +164,7 @@ namespace 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getTables" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -317,55 +317,55 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxBinaryLiteralLength" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxRowSize" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxCatalogNameLength" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxCharLiteralLength" ); return SAL_MAX_INT32; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnNameLength" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInIndex" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxCursorNameLength" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxConnections" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInTable" ); return 0; @@ -377,7 +377,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxTableNameLength" ); return 0; @@ -390,7 +390,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) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getTablePrivileges" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -459,19 +459,19 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( return xRef; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::doesMaxRowSizeIncludeBlobs" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesLowerCaseQuotedIdentifiers" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesLowerCaseIdentifiers" ); return sal_False; @@ -483,19 +483,19 @@ sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesMixedCaseIdentifiers" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesUpperCaseQuotedIdentifiers" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesUpperCaseIdentifiers" ); return sal_False; @@ -513,19 +513,19 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return sal_False; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxIndexLength" ); return 0; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsNonNullableColumns" ); return sal_False; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getCatalogTerm" ); return OUString(); @@ -538,13 +538,13 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return sQuote; } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getExtraNameCharacters" ); return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsDifferentTableCorrelationNames" ); return sal_True; @@ -556,67 +556,67 @@ sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::dataDefinitionIgnoredInTransactions" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::dataDefinitionCausesTransactionCommit" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsDataManipulationTransactionsOnly" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsPositionedDelete" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsPositionedUpdate" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenStatementsAcrossRollback" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenStatementsAcrossCommit" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenCursorsAcrossCommit" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenCursorsAcrossRollback" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTransactionIsolationLevel" ); return sal_False; @@ -628,25 +628,25 @@ sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsANSI92FullSQL" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsANSI92EntryLevelSQL" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsIntegrityEnhancementFacility" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSchemasInIndexDefinitions" ); return sal_False; @@ -664,7 +664,7 @@ sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCatalogsInIndexDefinitions" ); return sal_False; @@ -676,13 +676,13 @@ sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOuterJoins" ); return sal_False; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getTableTypes" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -701,163 +701,163 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxStatementLength" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxProcedureNameLength" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxSchemaNameLength" ); return 0; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTransactions" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::allProceduresAreCallable" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsStoredProcedures" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSelectForUpdate" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::allTablesAreSelectable" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::isReadOnly" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::usesLocalFiles" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::usesLocalFilePerTable" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTypeConversion" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullPlusNonNullIsNull" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsColumnAliasing" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTableCorrelationNames" ); return sal_True; } -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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsConvert" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsExpressionsInOrderBy" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsGroupBy" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsGroupByBeyondSelect" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsGroupByUnrelated" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMultipleTransactions" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMultipleResultSets" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsLikeEscapeClause" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOrderByUnrelated" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsUnion" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsUnionAll" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMixedCaseIdentifiers" ); return sal_True; @@ -869,248 +869,248 @@ sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedAtEnd" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedAtStart" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedHigh" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedLow" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSchemasInProcedureCalls" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCatalogsInProcedureCalls" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCorrelatedSubqueries" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInComparisons" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInExists" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInIns" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInQuantifieds" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsANSI92IntermediateSQL" ); return sal_False; } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getURL" ); static const OUString aValue( "sdbc:file:" ); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getUserName" ); return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverName" ); return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverVersion" ); return OUString::number(1); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDatabaseProductVersion" ); return OUString::number(0); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDatabaseProductName" ); return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getProcedureTerm" ); return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSchemaTerm" ); return OUString(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverMajorVersion" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDefaultTransactionIsolation" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverMinorVersion" ); return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSQLKeywords" ); return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSearchStringEscape" ); return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com 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) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com 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) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSystemFunctions" ); return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsExtendedSQLGrammar" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCoreSQLGrammar" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMinimumSQLGrammar" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsFullOuterJoins" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsLimitedOuterJoins" ); return sal_False; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInGroupBy" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInOrderBy" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInSelect" ); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxUserNameLength" ); return 0; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsResultSetType" ); switch(setType) @@ -1124,7 +1124,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) return sal_False; } -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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsResultSetConcurrency" ); switch(setType) @@ -1138,67 +1138,67 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ownUpdatesAreVisible" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ownDeletesAreVisible" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ownInsertsAreVisible" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::othersUpdatesAreVisible" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::othersDeletesAreVisible" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::othersInsertsAreVisible" ); return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::updatesAreDetected" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::deletesAreDetected" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::insertsAreDetected" ); return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsBatchUpdates" ); return sal_False; } -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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getUDTs" ); return NULL; diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 2d8ef7cb2298..4b18f9feeffa 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -76,24 +76,24 @@ Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (Run } -OUString SAL_CALL OFileDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OFileDriver::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } -sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::connect" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -108,13 +108,13 @@ Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, con } sal_Bool SAL_CALL OFileDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::acceptsURL" ); return url.startsWith("sdbc:file:"); } -Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getPropertyInfo" ); if ( acceptsURL(url) ) @@ -177,13 +177,13 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL OFileDriver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL OFileDriver::getMajorVersion( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getMajorVersion" ); return 1; } -sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getMinorVersion" ); return 0; @@ -191,7 +191,7 @@ sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) throw(RuntimeException) // XDataDefinitionSupplier -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getDataDefinitionByConnection" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -219,7 +219,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection } -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getDataDefinitionByURL" ); if ( ! acceptsURL(url) ) diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 2fa3a21e2a4a..97cd41eaf7d2 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -118,7 +118,7 @@ Reference OPreparedStatement::makeResultSet() -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, @@ -127,7 +127,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt static_cast< XResultSetMetaDataSupplier*>(this)); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ), @@ -137,7 +137,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::getMetaData" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -150,7 +150,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr } -void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::close" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -158,7 +158,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::execute" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -175,7 +175,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::executeUpdate" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -198,14 +198,14 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } -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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setString" ); setParameter(parameterIndex,x); } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::getConnection" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -215,7 +215,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::executeQuery" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -225,40 +225,40 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE } -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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBoolean" ); setParameter(parameterIndex,static_cast(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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setByte" ); setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setDate" ); setParameter(parameterIndex,DBTypeConversion::toDouble(aData)); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setTime" ); setParameter(parameterIndex,DBTypeConversion::toDouble(aVal)); } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setTimestamp" ); setParameter(parameterIndex,DBTypeConversion::toDouble(aVal)); } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setDouble" ); setParameter(parameterIndex,x); @@ -266,28 +266,28 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setFloat" ); setParameter(parameterIndex,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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setInt" ); setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setLong" ); throwFeatureNotImplementedException( "XParameters::setLong", *this ); } -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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setNull" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -300,35 +300,35 @@ 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) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setClob" ); throwFeatureNotImplementedException( "XParameters::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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBlob" ); throwFeatureNotImplementedException( "XParameters::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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setArray" ); throwFeatureNotImplementedException( "XParameters::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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setRef" ); throwFeatureNotImplementedException( "XParameters::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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setObjectWithInfo" ); switch(sqlType) @@ -344,14 +344,14 @@ 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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setObjectNull" ); 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setObject" ); if(!::dbtools::implSetObject(this,parameterIndex,x)) @@ -366,14 +366,14 @@ 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setShort" ); setParameter(parameterIndex,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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBytes" ); setParameter(parameterIndex,x); @@ -381,14 +381,14 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setCharacterStream" ); setBinaryStream(parameterIndex,x,length ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBinaryStream" ); if(!x.is()) @@ -400,7 +400,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::clearParameters" ); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 9d7f9dc93f7b..18cc3df0ba37 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -176,14 +176,14 @@ void OResultSet::disposing(void) m_aSkipDeletedSet.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::queryInterface" ); Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException, std::exception) { //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getTypes" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -196,7 +196,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException) } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::findColumn" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -239,69 +239,69 @@ void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc ::dbtools::throwInvalidIndexException(*this); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBinaryStream" ); return NULL; } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getCharacterStream" ); return NULL; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBoolean" ); return getValue(columnIndex); } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getByte" ); return getValue(columnIndex); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBytes" ); return getValue(columnIndex); } -::com::sun::star::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getDate" ); return getValue(columnIndex); } -double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getDouble" ); return getValue(columnIndex); } -float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getFloat" ); return getValue(columnIndex); } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getInt" ); return getValue(columnIndex); } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getRow" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -313,14 +313,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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getLong" ); return getValue(columnIndex); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getMetaData" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -332,7 +332,7 @@ 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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getArray" ); return NULL; @@ -340,59 +340,59 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getClob" ); return NULL; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBlob" ); return NULL; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getRef" ); return NULL; } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getObject" ); 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getShort" ); return getValue(columnIndex); } -OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getString" ); return getValue(columnIndex); } -::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getTime" ); return getValue(columnIndex); } -::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getTimestamp" ); return getValue(columnIndex); } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isAfterLast" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -402,7 +402,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) +sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isFirst" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -412,7 +412,7 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) return m_nRowPos == 0; } -sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isLast" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -422,7 +422,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) return m_nRowPos == sal_Int32(m_pFileSet->get().size() - 1); } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::beforeFirst" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -433,7 +433,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) previous(); } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::afterLast" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -446,14 +446,14 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::close" ); dispose(); } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::first" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -462,7 +462,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( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::last" ); // here I know definitely that I stand on the last record @@ -471,7 +471,7 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_True) : sal_False; } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::absolute" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -479,7 +479,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::ABSOLUTE,row,sal_True) : sal_False; } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::relative" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -487,7 +487,7 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::RELATIVE,row,sal_True) : sal_False; } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::previous" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -495,7 +495,7 @@ sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::PRIOR,0,sal_True) : sal_False; } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getStatement" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -506,7 +506,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException } -sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::rowDeleted" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -516,7 +516,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio return m_bRowDeleted; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -524,7 +524,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti return m_bRowInserted; } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::rowInserted" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -535,7 +535,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( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isBeforeFirst" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -578,7 +578,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( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::next" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -588,7 +588,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( ) throw(SQLException, RuntimeException, std::exception) { //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::wasNull" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -598,23 +598,23 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::cancel" ); } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::clearWarnings" ); } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getWarnings" ); return Any(); } -void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::insertRow" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -639,7 +639,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) } } -void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateRow" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -654,7 +654,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) clearInsertRow(); } -void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::deleteRow" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -678,7 +678,7 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException) } } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::cancelRowUpdates" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -702,7 +702,7 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::moveToInsertRow" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -722,7 +722,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::moveToCurrentRow" ); } @@ -741,7 +741,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateNull" ); ORowSetValue aEmpty; @@ -749,84 +749,84 @@ 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateBoolean" ); updateValue(columnIndex, static_cast(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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateByte" ); 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateShort" ); 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateInt" ); 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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateLong" ); ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateLong", *this ); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateFloat" ); 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateDouble" ); 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateString" ); 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateBytes" ); updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateDate" ); updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateTime" ); updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateTimestamp" ); updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateBinaryStream" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -840,20 +840,20 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateValue(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateCharacterStream" ); updateBinaryStream(columnIndex,x,length); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com 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) +void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateObject" ); if (!::dbtools::implUpdateObject(this, columnIndex, x)) @@ -861,7 +861,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) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateNumericObject" ); if (!::dbtools::implUpdateObject(this, columnIndex, x)) @@ -1617,7 +1617,7 @@ Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId() // com::sun::star::lang::XUnoTunnel -sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getSomething" ); return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -1754,7 +1754,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(RuntimeException) +Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) { //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getPropertySetInfo" ); return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); @@ -1832,7 +1832,7 @@ sal_Bool OResultSet::isRowDeleted() const return m_aRow->isDeleted(); } -void SAL_CALL OResultSet::disposing( const EventObject& Source ) throw (RuntimeException) +void SAL_CALL OResultSet::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::disposing" ); Reference xProp = m_pTable; diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index 4f0d493f3b01..a90c9babac85 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -57,14 +57,14 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, throwInvalidIndexException(*this); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnDisplaySize" ); return getPrecision(column); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnType" ); checkColumnIndex(column); @@ -72,28 +72,28 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(S } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnCount" ); return (m_xColumns->get()).size(); } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isCaseSensitive" ); return sal_False; } -OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getSchemaName" ); return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnName" ); checkColumnIndex(column); @@ -102,39 +102,39 @@ 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) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getTableName" ); return m_aTableName; } -OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getCatalogName" ); return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnTypeName" ); 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) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnLabel" ); return getColumnName(column); } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnServiceName" ); return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isCurrency" ); checkColumnIndex(column); @@ -142,26 +142,26 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLEx } -sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isAutoIncrement" ); return sal_False; } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isSigned" ); return sal_True; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getPrecision" ); 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getScale" ); checkColumnIndex(column); @@ -169,7 +169,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com: } -sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isNullable" ); checkColumnIndex(column); @@ -177,14 +177,14 @@ 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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isSearchable" ); return sal_True; } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isReadOnly" ); checkColumnIndex(column); @@ -194,13 +194,13 @@ 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 ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isDefinitelyWritable" ); return !isReadOnly(column); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isWritable" ); return !isReadOnly(column); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 8fb975f65d3f..9ba315fb72dd 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -150,14 +150,14 @@ void SAL_CALL OStatement_BASE2::release() throw() relase_ChildImpl(); } -Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::queryInterface" ); const Any aRet = OStatement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getTypes" ); ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), @@ -168,13 +168,13 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException) } -void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) +void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::cancel" ); } -void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::close" ); { @@ -196,7 +196,7 @@ void OStatement_Base::reset() throw (SQLException) } -Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getWarnings" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -205,7 +205,7 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti return makeAny(m_aLastWarning); } -void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::clearWarnings" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -247,7 +247,7 @@ void SAL_CALL OStatement::release() throw() } -sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -258,7 +258,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, -Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -274,12 +274,12 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) return xRS; } -Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { return (Reference< XConnection >)m_pConnection; } -sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -307,13 +307,13 @@ void SAL_CALL OStatement_Base::disposing(void) OStatement_BASE::disposing(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException) +Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getPropertySetInfo" ); return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OStatement_XStatement::queryInterface( rType); return aRet.hasValue() ? aRet : OStatement_BASE2::queryInterface( rType); diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index f687fd4ea625..95e45b4ab0ee 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -114,7 +114,7 @@ void OFileTable::refreshIndexes() SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::refreshIndexes" ); } -Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::queryInterface" ); if( rType == ::getCppuType((const Reference*)0) || @@ -155,7 +155,7 @@ Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId() // com::sun::star::lang::XUnoTunnel -sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::getSomething" ); return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx index 6b3f78251a3b..acff3d59142b 100644 --- a/connectivity/source/drivers/file/FTables.cxx +++ b/connectivity/source/drivers/file/FTables.cxx @@ -51,7 +51,7 @@ m_xMetaData.clear(); OCollection::disposing(); } -Any SAL_CALL OTables::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { if( rType == ::getCppuType((const Reference*)0) || rType == ::getCppuType((const Reference*)0) || diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx index e1968ba7ce5b..c11616ea31ed 100644 --- a/connectivity/source/drivers/firebird/Blob.cxx +++ b/connectivity/source/drivers/firebird/Blob.cxx @@ -123,7 +123,7 @@ void SAL_CALL Blob::disposing(void) } sal_Int64 SAL_CALL Blob::length() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Blob_BASE::rBHelper.bDisposed); @@ -134,7 +134,7 @@ sal_Int64 SAL_CALL Blob::length() uno::Sequence< sal_Int8 > SAL_CALL Blob::getBytes(sal_Int64 nPosition, sal_Int32 nBytes) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Blob_BASE::rBHelper.bDisposed); @@ -162,14 +162,14 @@ uno::Sequence< sal_Int8 > SAL_CALL Blob::getBytes(sal_Int64 nPosition, } uno::Reference< XInputStream > SAL_CALL Blob::getBinaryStream() - throw(SQLException, RuntimeException) + 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) + throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException("Blob::position", *this); return 0; @@ -177,7 +177,7 @@ 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) + throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException("Blob::positionOfBlob", *this); return 0; @@ -187,7 +187,7 @@ 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) + throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Blob_BASE::rBHelper.bDisposed); @@ -223,7 +223,7 @@ 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) + 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 @@ -232,7 +232,7 @@ sal_Int32 SAL_CALL Blob::readSomeBytes(uno::Sequence< sal_Int8 >& rDataOut, } void SAL_CALL Blob::skipBytes(sal_Int32 nBytesToSkip) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + 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. @@ -241,7 +241,7 @@ void SAL_CALL Blob::skipBytes(sal_Int32 nBytesToSkip) } sal_Int32 SAL_CALL Blob::available() - throw (NotConnectedException, IOException, RuntimeException) + throw (NotConnectedException, IOException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Blob_BASE::rBHelper.bDisposed); @@ -251,7 +251,7 @@ sal_Int32 SAL_CALL Blob::available() } void SAL_CALL Blob::closeInput() - throw(NotConnectedException, IOException, RuntimeException) + throw(NotConnectedException, IOException, RuntimeException, std::exception) { closeBlob(); } diff --git a/connectivity/source/drivers/firebird/Blob.hxx b/connectivity/source/drivers/firebird/Blob.hxx index 3814f59005a7..243535aace22 100644 --- a/connectivity/source/drivers/firebird/Blob.hxx +++ b/connectivity/source/drivers/firebird/Blob.hxx @@ -63,25 +63,25 @@ namespace connectivity virtual sal_Int64 SAL_CALL length() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int64 aPosition, sal_Int32 aLength) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int64 SAL_CALL position(const ::com::sun::star::uno::Sequence< sal_Int8 >& rPattern, sal_Int64 aStart) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int64 SAL_CALL positionOfBlob(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& rPattern, sal_Int64 aStart) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ---- XInputStream ---------------------------------------------- virtual sal_Int32 SAL_CALL @@ -90,30 +90,30 @@ namespace connectivity throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL readSomeBytes(::com::sun::star::uno::Sequence< sal_Int8 >& rDataOut, sal_Int32 nMaximumBytes) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes(sal_Int32 nBytes) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL available() throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL closeInput() throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // ---- OComponentHelper ------------------------------------------ virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 41680747f0be..2c46886d5d47 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -330,7 +330,7 @@ Reference< XBlob> Connection::createBlob(ISC_QUAD* pBlobId) //----- XConnection ---------------------------------------------------------- Reference< XStatement > SAL_CALL Connection::createStatement( ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "createStatement()."); @@ -377,7 +377,7 @@ OUString Connection::transformPreparedStatement(const OUString& _sSQL) Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement( const OUString& _sSql) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "prepareStatement() " "called with sql: " << _sSql); @@ -398,7 +398,7 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement( } Reference< XPreparedStatement > SAL_CALL Connection::prepareCall( - const OUString& _sSql ) throw(SQLException, RuntimeException) + const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "prepareCall(). " "_sSql: " << _sSql); @@ -413,7 +413,7 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareCall( } OUString SAL_CALL Connection::nativeSQL( const OUString& _sSql ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); // We do not need to adapt the SQL for Firebird atm. @@ -421,7 +421,7 @@ OUString SAL_CALL Connection::nativeSQL( const OUString& _sSql ) } void SAL_CALL Connection::setAutoCommit( sal_Bool autoCommit ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -434,7 +434,7 @@ void SAL_CALL Connection::setAutoCommit( sal_Bool autoCommit ) } } -sal_Bool SAL_CALL Connection::getAutoCommit() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL Connection::getAutoCommit() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -511,7 +511,7 @@ isc_tr_handle& Connection::getTransaction() return m_aTransactionHandle; } -void SAL_CALL Connection::commit() throw(SQLException, RuntimeException) +void SAL_CALL Connection::commit() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -528,7 +528,7 @@ void SAL_CALL Connection::commit() throw(SQLException, RuntimeException) } } -void SAL_CALL Connection::rollback() throw(SQLException, RuntimeException) +void SAL_CALL Connection::rollback() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -541,7 +541,7 @@ void SAL_CALL Connection::rollback() throw(SQLException, RuntimeException) } } -sal_Bool SAL_CALL Connection::isClosed( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL Connection::isClosed( ) throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); @@ -549,7 +549,7 @@ sal_Bool SAL_CALL Connection::isClosed( ) throw(SQLException, RuntimeException) return Connection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -567,7 +567,7 @@ Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData( ) throw(SQLExc } void SAL_CALL Connection::setReadOnly(sal_Bool readOnly) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -576,7 +576,7 @@ void SAL_CALL Connection::setReadOnly(sal_Bool readOnly) setupTransaction(); } -sal_Bool SAL_CALL Connection::isReadOnly() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL Connection::isReadOnly() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -585,19 +585,19 @@ sal_Bool SAL_CALL Connection::isReadOnly() throw(SQLException, RuntimeException) } void SAL_CALL Connection::setCatalog(const OUString& /*catalog*/) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("setCatalog", *this); } OUString SAL_CALL Connection::getCatalog() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("getCatalog", *this); return OUString(); } -void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException) +void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -606,7 +606,7 @@ void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLEx setupTransaction(); } -sal_Int32 SAL_CALL Connection::getTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL Connection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -614,21 +614,21 @@ sal_Int32 SAL_CALL Connection::getTransactionIsolation( ) throw(SQLException, R return m_aTransactionIsolation; } -Reference< XNameAccess > SAL_CALL Connection::getTypeMap() throw(SQLException, RuntimeException) +Reference< XNameAccess > SAL_CALL Connection::getTypeMap() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::getTypeMap", *this ); return 0; } void SAL_CALL Connection::setTypeMap(const Reference< XNameAccess >& typeMap) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this ); (void) typeMap; } //----- XCloseable ----------------------------------------------------------- -void SAL_CALL Connection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL Connection::close( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "close()."); @@ -642,20 +642,20 @@ void SAL_CALL Connection::close( ) throw(SQLException, RuntimeException) } // XWarningsSupplier -Any SAL_CALL Connection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL Connection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL Connection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL Connection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { // you should clear your collected warnings here } // XDocumentEventListener void SAL_CALL Connection::documentEventOccured( const DocumentEvent& _Event ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -687,7 +687,7 @@ void SAL_CALL Connection::documentEventOccured( const DocumentEvent& _Event ) } // XEventListener void SAL_CALL Connection::disposing(const EventObject& /*rSource*/) - throw (RuntimeException) + throw (RuntimeException, std::exception) { } diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 7850da7d80ad..7ae00db6a4ac 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -223,33 +223,33 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // XConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const ::com::sun::star::document::DocumentEvent& Event ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL documentEventOccured( const ::com::sun::star::document::DocumentEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); // css.lang.XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index ef7af338e849..4d2d83f28000 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -54,103 +54,103 @@ ODatabaseMetaData::~ODatabaseMetaData() } //----- Catalog Info -- UNSUPPORTED ------------------------------------------- -OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() throw(SQLException, RuntimeException, std::exception) { return OUString(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength() throw(SQLException, RuntimeException, std::exception) { return -1; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() throw(SQLException, RuntimeException, std::exception) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart() throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions() throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions() throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() throw(SQLException, RuntimeException) +uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() throw(SQLException, RuntimeException, std::exception) { OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCatalogs); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls() throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() throw(SQLException, RuntimeException, std::exception) { return sal_False; } //----- Schema Info -- UNSUPPORTED -------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInDataManipulation() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInTableDefinitions() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return -1; } OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return OUString(); } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { OSL_FAIL("Not implemented yet!"); // TODO implement @@ -158,68 +158,68 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() } //----- Max Sizes/Lengths ----------------------------------------------------- -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() throw(SQLException, RuntimeException, std::exception) { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() throw(SQLException, RuntimeException, std::exception) { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() throw(SQLException, RuntimeException, std::exception) { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() throw(SQLException, RuntimeException, std::exception) { return 31; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() throw(SQLException, RuntimeException, std::exception) { // TODO: No idea. // See: http://www.firebirdsql.org/en/firebird-technical-specifications/ return 16; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() throw(SQLException, RuntimeException, std::exception) { return 32; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() throw(SQLException, RuntimeException, std::exception) { return 100; // Arbitrary } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() throw(SQLException, RuntimeException, std::exception) { // May however be smaller. // See: http://www.firebirdsql.org/en/firebird-technical-specifications/ return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() throw(SQLException, RuntimeException, std::exception) { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() throw(SQLException, RuntimeException, std::exception) { return 31; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -227,25 +227,25 @@ 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) + throw(SQLException, RuntimeException, std::exception) { OUString aVal('"'); return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: confirm this -- the documentation is highly ambiguous // However it seems this should be true as quoted identifiers ARE @@ -254,7 +254,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers() } sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -262,80 +262,80 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers() // ---- Unquoted Identifiers ------------------------------------------------- // All unquoted identifers are stored upper case. sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } // ---- SQL Feature Support --------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithAddColumn() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithDropColumn() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: true if embedded, but unsure about remote server return sal_True; @@ -343,7 +343,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable() sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 fromType, sal_Int32 toType) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { (void) fromType; (void) toType; @@ -351,109 +351,109 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 fromType, } sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) { OUString aVal; return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } // ---- Data definition stuff ------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData:: supportsDataDefinitionAndDataManipulationTransactions() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } //----- Transaction Support -------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return sal_True; } sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 aLevel) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return aLevel == TransactionIsolation::READ_UNCOMMITTED || aLevel == TransactionIsolation::READ_COMMITTED @@ -462,290 +462,290 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( } sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return TransactionIsolation::REPEATABLE_READ; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; // should be supported at least } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 31; // TODO: confirm return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { return m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) { return m_pConnection->isEmbedded(); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) { // Unsure return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { // Unsure return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL ODatabaseMetaData::getURL() throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL() throw(SQLException, RuntimeException, std::exception) { return m_pConnection->getConnectionURL(); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) { return 1; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) { return 31; } sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { switch (setType) { @@ -759,7 +759,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType) sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 aResultSetType, sal_Int32 aConcurrency) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { if (aResultSetType == ResultSetType::FORWARD_ONLY && aConcurrency == ResultSetConcurrency::READ_ONLY) @@ -768,69 +768,69 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { (void) setType; return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { (void) setType; return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { (void) setType; return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { (void) setType; return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { (void) setType; return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { (void) setType; return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { (void) setType; return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { (void) setType; return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { (void) setType; return sal_False; } sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // No batch support in firebird return sal_False; } uno::Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return (uno::Reference< XConnection >) m_pConnection; } @@ -840,7 +840,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) +uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) { OSL_FAIL("Not implemented yet!"); // TODO implement @@ -848,7 +848,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getTypeInfo()"); @@ -1025,7 +1025,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( const OUString& /*sSchema*/, const OUString& sTable, const OUString& sColumnNamePattern) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getColumnPrivileges() with " "Table: " << sTable @@ -1100,7 +1100,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const OUString& columnNamePattern) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getColumns() with " "TableNamePattern: " << tableNamePattern << @@ -1287,7 +1287,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const Sequence< OUString >& types) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getTables() with " "TableNamePattern: " << tableNamePattern); @@ -1412,7 +1412,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) + const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { SAL_WARN("connectivity.firebird", "Not yet implemented"); (void) catalog; @@ -1426,7 +1426,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) + const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception) { SAL_WARN("connectivity.firebird", "Not yet implemented"); (void) catalog; @@ -1438,7 +1438,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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { SAL_WARN("connectivity.firebird", "Not yet implemented"); (void) catalog; @@ -1450,7 +1450,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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { // List the columns in a table which are foreign keys. This is actually // never used anywhere in the LO codebase currently. Retrieval from firebird @@ -1465,7 +1465,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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { // List the columns in a table (which must be primary key, or possibly just // unique) that are referred to in other foreign keys. Will have a similar @@ -1483,7 +1483,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( const Any& /*aCatalog*/, const OUString& /*sSchema*/, const OUString& sTable) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getPrimaryKeys() with " "Table: " << sTable); @@ -1546,7 +1546,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( const OUString& sTable, sal_Bool bIsUnique, sal_Bool bIsApproximate) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Apparently this method can also return a "tableIndexStatistic" // However this is only mentioned in XDatabaseMetaData.idl (whose comments @@ -1636,7 +1636,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) + sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception) { (void) catalog; (void) schema; @@ -1652,7 +1652,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const Any& /*aCatalog*/, const OUString& /*sSchemaPattern*/, const OUString& sTableNamePattern) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getTablePrivileges() with " "TableNamePattern: " << sTableNamePattern); @@ -1719,7 +1719,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) + const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception) { (void) primaryCatalog; (void) primarySchema; @@ -1732,7 +1732,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) +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) { (void) catalog; (void) schemaPattern; diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx index 3004df9d3a2f..2c0cc4b00e12 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx @@ -47,155 +47,155 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 4b51ed22d80c..dda95afbbb17 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -127,19 +127,19 @@ Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (Ru return aSNS; } -OUString SAL_CALL FirebirdDriver::getImplementationName() throw(RuntimeException) +OUString SAL_CALL FirebirdDriver::getImplementationName() throw(RuntimeException, std::exception) { return getImplementationName_Static(); } sal_Bool SAL_CALL FirebirdDriver::supportsService(const OUString& _rServiceName) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } Sequence< OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -147,7 +147,7 @@ Sequence< OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames() // ---- XDriver ------------------------------------------------------------- Reference< XConnection > SAL_CALL FirebirdDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { Reference< XConnection > xConnection; @@ -169,7 +169,7 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect( } sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SvtMiscOptions aMiscOptions; @@ -179,7 +179,7 @@ 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) + throw(SQLException, RuntimeException, std::exception) { (void) info; if ( ! acceptsURL(url) ) @@ -192,14 +192,14 @@ Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo( return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion( ) throw(RuntimeException, std::exception) { // 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) +sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( ) throw(RuntimeException, std::exception) { return 0; } @@ -207,7 +207,7 @@ sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( ) throw(RuntimeException) //----- XDataDefinitionSupplier uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByConnection( const uno::Reference< XConnection >& rConnection) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { Connection* pConnection = static_cast< Connection* >(rConnection.get()); return uno::Reference< XTablesSupplier >(pConnection->createCatalog(), UNO_QUERY); @@ -216,7 +216,7 @@ 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) + throw(SQLException, RuntimeException, std::exception) { uno::Reference< XConnection > xConnection = connect(rURL, rInfo); return getDataDefinitionByConnection(xConnection); diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index 83a48565a039..895743c890f8 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -72,29 +72,29 @@ namespace connectivity static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDataDefinitionSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& rxConnection) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& rsURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rInfo) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index 1379f8242bd4..d5e1213a93a6 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -129,7 +129,7 @@ void SAL_CALL OPreparedStatement::release() throw() } Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType) - throw(RuntimeException) + throw(RuntimeException, std::exception) { Any aRet = OStatementCommonBase::queryInterface(rType); if(!aRet.hasValue()) @@ -138,14 +138,14 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType) } uno::Sequence< Type > SAL_CALL OPreparedStatement::getTypes() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return concatSequences(OPreparedStatement_Base::getTypes(), OStatementCommonBase::getTypes()); } Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -157,7 +157,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() return m_xMetaData; } -void SAL_CALL OPreparedStatement::close() throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::close() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -184,7 +184,7 @@ void SAL_CALL OPreparedStatement::disposing() void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex, const OUString& x) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "setString(" << nParameterIndex << " , " << x << ")"); @@ -234,7 +234,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex, } Reference< XConnection > SAL_CALL OPreparedStatement::getConnection() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -243,7 +243,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection() } sal_Bool SAL_CALL OPreparedStatement::execute() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "executeQuery(). " "Got called with sql: " << m_sSqlStatement); @@ -296,14 +296,14 @@ sal_Bool SAL_CALL OPreparedStatement::execute() } sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { execute(); return getStatementChangeCount(); } Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { execute(); return m_xResultSet; @@ -311,7 +311,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery() //----- XParameters ----------------------------------------------------------- void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 /*nSqlType*/) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -321,7 +321,7 @@ 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) + throw(SQLException, RuntimeException, std::exception) { // FIREBIRD3: will need to be implemented. ::dbtools::throwFunctionNotSupportedException("XParameters::setBoolean", *this); @@ -352,43 +352,43 @@ 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) + throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("XParameters::setByte", *this); } void SAL_CALL OPreparedStatement::setShort(sal_Int32 nIndex, sal_Int16 nValue) - throw(SQLException, RuntimeException) + 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) + 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) + 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) + throw(SQLException, RuntimeException, std::exception) { setValue< float >(nIndex, nValue, SQL_FLOAT); } void SAL_CALL OPreparedStatement::setDouble(sal_Int32 nIndex, double nValue) - throw(SQLException, RuntimeException) + 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) + throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; aCTime.tm_mday = rDate.Day; @@ -402,7 +402,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex, const Date& rDate) } void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const Time& rTime) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; aCTime.tm_sec = rTime.Seconds; @@ -416,7 +416,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const Time& rTime) } void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 nIndex, const DateTime& rTimestamp) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; aCTime.tm_sec = rTimestamp.Seconds; @@ -470,7 +470,7 @@ void OPreparedStatement::closeBlobAfterWriting(isc_blob_handle& rBlobHandle) } } -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 ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) x; @@ -481,7 +481,7 @@ 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) + throw (SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -528,7 +528,7 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex, -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 ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) x; @@ -538,7 +538,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) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) x; @@ -548,7 +548,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) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) x; @@ -560,7 +560,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) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) sqlType; @@ -571,7 +571,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) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) x; @@ -582,7 +582,7 @@ 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) + throw (SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -626,7 +626,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex, -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) x; @@ -637,7 +637,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { (void) parameterIndex; (void) x; @@ -648,31 +648,31 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) { } // ---- Batch methods -- unsupported ----------------------------------------- void SAL_CALL OPreparedStatement::clearBatch() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Unsupported } void SAL_CALL OPreparedStatement::addBatch() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Unsupported by firebird } Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Unsupported by firebird return Sequence< sal_Int32 >(); } -void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) { switch(nHandle) { diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx index ea1bb0590cd3..90e89a8c2362 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.hxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx @@ -99,7 +99,7 @@ namespace connectivity protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual ~OPreparedStatement(); public: DECLARE_SERVICE_INFO(); @@ -109,90 +109,90 @@ namespace connectivity const ::rtl::OUString& sql); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPreparedStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL executeUpdate() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL execute() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XParameters virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setInt(sal_Int32 nIndex, sal_Int32 nValue) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XPreparedBatchExecution -- UNSUPPORTED by firebird virtual void SAL_CALL addBatch() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearBatch() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable virtual void SAL_CALL close() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index 7e73cd8748b5..22d6013d5ff8 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -114,7 +114,7 @@ OResultSet::~OResultSet() } // ---- XResultSet -- Row retrieval methods ------------------------------------ -sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -122,7 +122,7 @@ sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException) return m_currentRow; } -sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -151,21 +151,21 @@ sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException) } } -sal_Bool SAL_CALL OResultSet::previous() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::previous() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("previous not supported in firebird", *this); return sal_False; } -sal_Bool SAL_CALL OResultSet::isLast() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isLast() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("isLast not supported in firebird", *this); return sal_False; } -sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -173,7 +173,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeExcepti return m_currentRow == 0; } -sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -181,7 +181,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException return m_bIsAfterLastRow; } -sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -189,7 +189,7 @@ sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException) return m_currentRow == 1 && !m_bIsAfterLastRow; } -void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -199,7 +199,7 @@ void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException) *this); } -void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -209,7 +209,7 @@ void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException) *this); } -sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -230,7 +230,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() throw(SQLException, RuntimeException, std::exception) { // 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. @@ -239,7 +239,7 @@ sal_Bool SAL_CALL OResultSet::last() throw(SQLException, RuntimeException) return sal_False; } -sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -257,7 +257,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) +sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -309,19 +309,19 @@ void SAL_CALL OResultSet::checkRowIndex() } } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OResultSet::getTypes() throw( RuntimeException) + Sequence< Type > SAL_CALL OResultSet::getTypes() throw( RuntimeException, std::exception) { return concatSequences(OPropertySetHelper::getTypes(), OResultSet_BASE::getTypes()); } // ---- XColumnLocate --------------------------------------------------------- sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& rColumnName) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -343,7 +343,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) +uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -352,7 +352,7 @@ uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 c return NULL; } -uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -544,7 +544,7 @@ T OResultSet::safelyRetrieveValue(const sal_Int32 nColumnIndex, const ISC_SHORT } // ---- XRow ----------------------------------------------------------------- -sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -554,21 +554,21 @@ sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException) // ---- XRow: Simple Numerical types ------------------------------------------ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 nColumnIndex) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Not a native firebird type hence we always have to convert. return safelyRetrieveValue< ORowSetValue >(nColumnIndex); } sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 nColumnIndex) - throw(SQLException, RuntimeException) + 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) + throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; return Sequence< sal_Int8 >(); // TODO: implement @@ -576,62 +576,62 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 columnIndex) } sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 columnIndex) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< sal_Int16 >(columnIndex, SQL_SHORT); } sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 columnIndex) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< sal_Int32 >(columnIndex, SQL_LONG); } sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 columnIndex) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< sal_Int64 >(columnIndex, SQL_INT64); } float SAL_CALL OResultSet::getFloat(sal_Int32 columnIndex) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< float >(columnIndex, SQL_FLOAT); } double SAL_CALL OResultSet::getDouble(sal_Int32 columnIndex) - throw(SQLException, RuntimeException) + 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) + throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< OUString >(nIndex); } Date SAL_CALL OResultSet::getDate(sal_Int32 nIndex) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< Date >(nIndex, SQL_TYPE_DATE); } Time SAL_CALL OResultSet::getTime(sal_Int32 nIndex) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< Time >(nIndex, SQL_TYPE_TIME); } DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 nIndex) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< DateTime >(nIndex, SQL_TIMESTAMP); } -uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException) +uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -641,7 +641,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) +uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -652,7 +652,7 @@ uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) -uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -662,7 +662,7 @@ uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) th } uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -676,7 +676,7 @@ uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex) } -uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -686,7 +686,7 @@ uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) thro } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; (void) typeMap; @@ -700,7 +700,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< -void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "close()."); @@ -713,7 +713,7 @@ void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException) uno::Reference< XInterface > SAL_CALL OResultSet::getStatement() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -721,34 +721,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) +sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("rowDeleted not supported in firebird", *this); return sal_False; } -sal_Bool SAL_CALL OResultSet::rowInserted() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowInserted() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("rowInserted not supported in firebird", *this); return sal_False; } -sal_Bool SAL_CALL OResultSet::rowUpdated() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowUpdated() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("rowUpdated not supported in firebird", *this); return sal_False; } -void SAL_CALL OResultSet::refreshRow() throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::refreshRow() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("refreshRow not supported in firebird", *this); } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -756,13 +756,13 @@ void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) } //----- XWarningsSupplier UNSUPPORTED ----------------------------------------- -void SAL_CALL OResultSet::clearWarnings() throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::clearWarnings() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("clearWarnings not supported in firebird", *this); } -Any SAL_CALL OResultSet::getWarnings() throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getWarnings() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("getWarnings not supported in firebird", *this); @@ -792,19 +792,19 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ---- XServiceInfo ----------------------------------------------------------- -OUString SAL_CALL OResultSet::getImplementationName() throw ( RuntimeException) +OUString SAL_CALL OResultSet::getImplementationName() throw ( RuntimeException, std::exception) { return OUString("com.sun.star.sdbcx.firebird.ResultSet"); } Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames() - throw( RuntimeException) + throw( RuntimeException, std::exception) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -813,7 +813,7 @@ Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames() } sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName) - throw( RuntimeException) + 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 db68c066e936..9f4560382518 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -131,67 +131,67 @@ namespace connectivity // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XColumnLocate virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx index 31110fc17e86..fc0ba50deef8 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx @@ -41,19 +41,19 @@ void OResultSetMetaData::verifyValidColumn(sal_Int32 column) throw SQLException("Invalid column specified", *this, OUString(), 0, Any()); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException, std::exception) { return m_pSqlda->sqld; } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); return 32; // Hard limit for firebird } sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); @@ -63,7 +63,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Firebird is generally case sensitive when using quoted identifiers. // IF THIS CHANGES make ResultSet::findColumn to be case-insenstive as needed. @@ -75,14 +75,14 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { (void) column; return OUString(); // Schemas supported by firebird } OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); OUString sRet(m_pSqlda->sqlvar[column-1].sqlname, @@ -93,7 +93,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); return OUString(m_pSqlda->sqlvar[column-1].relname, @@ -102,14 +102,14 @@ OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) - throw(SQLException, RuntimeException) + 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) + throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); @@ -119,14 +119,14 @@ OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: clarify what this is -- probably not the alias return getColumnName(column); } OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: implement (void) column; @@ -134,14 +134,14 @@ OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { (void) column; return sal_False; } sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Supported internally but no way of determining this here. (void) column; @@ -150,7 +150,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // Unsigned values aren't supported in firebird. (void) column; @@ -158,7 +158,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: implement (void) column; @@ -166,13 +166,13 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return m_pSqlda->sqlvar[column-1].sqlscale; } sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { if (m_pSqlda->sqlvar[column-1].sqltype & 1) return ColumnValue::NULLABLE; @@ -181,7 +181,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { // TODO: Can the column be used as part of a where clause? Assume yes (void) column; @@ -189,20 +189,20 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) - throw(SQLException, RuntimeException) + 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) + throw(SQLException, RuntimeException, std::exception) { (void) column; return !m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { (void) column; return !m_pConnection->isReadOnly(); diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx index 694cbc131e92..c74b60a6f92a 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx @@ -57,47 +57,47 @@ namespace connectivity { return this; } virtual sal_Int32 SAL_CALL getColumnCount() - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isSearchable(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isCurrency(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isSigned(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getScale(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isWritable(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx index 2364ed22a044..94b947409245 100644 --- a/connectivity/source/drivers/firebird/Statement.cxx +++ b/connectivity/source/drivers/firebird/Statement.cxx @@ -52,16 +52,16 @@ using namespace ::std; // ---- XBatchExecution - UNSUPPORTED ---------------------------------------- void SAL_CALL OStatement::addBatch(const OUString& sql) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { (void) sql; } -void SAL_CALL OStatement::clearBatch() throw(SQLException, RuntimeException) +void SAL_CALL OStatement::clearBatch() throw(SQLException, RuntimeException, std::exception) { } -Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() throw(SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() throw(SQLException, RuntimeException, std::exception) { return Sequence< sal_Int32 >(); } @@ -95,7 +95,7 @@ void OStatement::disposeResultSet() // ---- XStatement ----------------------------------------------------------- sal_Int32 SAL_CALL OStatement::executeUpdate(const OUString& sql) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { execute(sql); return getStatementChangeCount(); @@ -103,7 +103,7 @@ sal_Int32 SAL_CALL OStatement::executeUpdate(const OUString& sql) uno::Reference< XResultSet > SAL_CALL OStatement::executeQuery(const OUString& sql) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -149,7 +149,7 @@ uno::Reference< XResultSet > SAL_CALL OStatement::executeQuery(const OUString& s } sal_Bool SAL_CALL OStatement::execute(const OUString& sql) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { uno::Reference< XResultSet > xResults = executeQuery(sql); return xResults.is(); @@ -157,7 +157,7 @@ sal_Bool SAL_CALL OStatement::execute(const OUString& sql) } uno::Reference< XConnection > SAL_CALL OStatement::getConnection() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -165,7 +165,7 @@ uno::Reference< XConnection > SAL_CALL OStatement::getConnection() return (uno::Reference< XConnection >)m_pConnection; } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OStatement_Base::queryInterface(rType); if(!aRet.hasValue()) @@ -176,13 +176,13 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep } uno::Sequence< Type > SAL_CALL OStatement::getTypes() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return concatSequences(OStatement_Base::getTypes(), OStatementCommonBase::getTypes()); } -void SAL_CALL OStatement::close() throw(SQLException, RuntimeException) +void SAL_CALL OStatement::close() throw(SQLException, RuntimeException, std::exception) { OStatementCommonBase::close(); } diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx index 7ac6ea112fce..15b81f224bee 100644 --- a/connectivity/source/drivers/firebird/Statement.hxx +++ b/connectivity/source/drivers/firebird/Statement.hxx @@ -59,34 +59,34 @@ namespace connectivity // XStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const ::rtl::OUString& sql) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL execute(const ::rtl::OUString& sql) - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() - throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XBatchExecution - UNSUPPORTED - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XCloseable virtual void SAL_CALL close() throw(::com::sun::star::sdbc::SQLException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index 190730f8029c..93770c2ffdd6 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -81,7 +81,7 @@ void OStatementCommonBase::freeStatementHandle() } -Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OStatementCommonBase_Base::queryInterface(rType); if(!aRet.hasValue()) @@ -89,7 +89,7 @@ Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(Ru return aRet; } -Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) throw(RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::cppu::UnoType< uno::Reference< XMultiPropertySet > >::get(), @@ -100,7 +100,7 @@ Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) throw(RuntimeExcept } -void SAL_CALL OStatementCommonBase::cancel( ) throw(RuntimeException) +void SAL_CALL OStatementCommonBase::cancel( ) throw(RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -108,7 +108,7 @@ void SAL_CALL OStatementCommonBase::cancel( ) throw(RuntimeException) } void SAL_CALL OStatementCommonBase::close() - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "close"); @@ -210,7 +210,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql, } // ---- XMultipleResults - UNSUPPORTED ---------------------------------------- -uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() throw(SQLException, RuntimeException) +uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() throw(SQLException, RuntimeException, std::exception) { // TODO: verify we really can't support this // return uno::Reference< XResultSet >(); @@ -220,7 +220,7 @@ uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() throw return m_xResultSet; } -sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() throw(SQLException, RuntimeException, std::exception) { // TODO: verify we really can't support this return sal_False; @@ -228,7 +228,7 @@ sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() throw(SQLException, Run // checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); } -sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() throw(SQLException, RuntimeException, std::exception) { // TODO: verify we really can't support this return 0; @@ -236,12 +236,12 @@ sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() throw(SQLException, Ru // ---- XWarningsSupplier - UNSUPPORTED ---------------------------------------- -Any SAL_CALL OStatementCommonBase::getWarnings() throw(SQLException, RuntimeException) +Any SAL_CALL OStatementCommonBase::getWarnings() throw(SQLException, RuntimeException, std::exception) { return Any(); } -void SAL_CALL OStatementCommonBase::clearWarnings() throw(SQLException, RuntimeException) +void SAL_CALL OStatementCommonBase::clearWarnings() throw(SQLException, RuntimeException, std::exception) { } @@ -288,7 +288,7 @@ sal_Bool OStatementCommonBase::convertFastPropertyValue( return bConverted; } -void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) { (void) rValue; // set the value to what ever is necessary @@ -339,7 +339,7 @@ void SAL_CALL OStatementCommonBase::release() throw() OStatementCommonBase_Base::release(); } -uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo( ) throw(RuntimeException) +uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index cabeb6b71ebc..b1e04114eb93 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -83,7 +83,7 @@ namespace connectivity throw (::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); + const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception, std::exception); virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; @@ -116,25 +116,25 @@ namespace connectivity virtual void SAL_CALL release() throw(); virtual void SAL_CALL acquire() throw(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - UNSUPPORTED - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XMultipleResults - UNSUPPORTED - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // other methods Connection* getOwnConnection() const { return m_pConnection;} diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx index 85ff0685c8ad..420a5176c787 100644 --- a/connectivity/source/drivers/firebird/Table.cxx +++ b/connectivity/source/drivers/firebird/Table.cxx @@ -113,7 +113,7 @@ OCollection* Table::createIndexes(const TStringVector& rNames) //----- XAlterTable ----------------------------------------------------------- void SAL_CALL Table::alterColumnByName(const OUString& rColName, const uno::Reference< XPropertySet >& rDescriptor) - throw(SQLException, NoSuchElementException, RuntimeException) + throw(SQLException, NoSuchElementException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(WeakComponentImplHelperBase::rBHelper.bDisposed); @@ -220,7 +220,7 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName, // ----- XRename -------------------------------------------------------------- void SAL_CALL Table::rename(const OUString& rName) - throw(SQLException, ElementExistException, RuntimeException) + throw(SQLException, ElementExistException, RuntimeException, std::exception) { (void) rName; throw RuntimeException(); // Firebird doesn't support this. @@ -228,7 +228,7 @@ void SAL_CALL Table::rename(const OUString& rName) // ----- XInterface ----------------------------------------------------------- Any SAL_CALL Table::queryInterface(const Type& rType) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (rType.getTypeName() == "com.sun.star.sdbcx.XRename") return Any(); @@ -238,7 +238,7 @@ Any SAL_CALL Table::queryInterface(const Type& rType) // ----- XTypeProvider -------------------------------------------------------- uno::Sequence< Type > SAL_CALL Table::getTypes() - throw(RuntimeException) + 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 f9684c06845c..070430f85c44 100644 --- a/connectivity/source/drivers/firebird/Table.hxx +++ b/connectivity/source/drivers/firebird/Table.hxx @@ -67,23 +67,23 @@ namespace connectivity const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rDescriptor) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // XRename -- UNSUPPORTED virtual void SAL_CALL rename(const ::rtl::OUString& sName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); //XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx index 56e16e4fc770..0a03cb1170cf 100644 --- a/connectivity/source/drivers/flat/EConnection.cxx +++ b/connectivity/source/drivers/flat/EConnection.cxx @@ -104,7 +104,7 @@ void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValu m_bShowDeleted = sal_True; // we do not supported rows for this type } -Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -133,7 +133,7 @@ Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData( ) throw(S return xTab; } -Reference< XStatement > SAL_CALL OFlatConnection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL OFlatConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -145,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) +Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -159,7 +159,7 @@ Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( cons return xStmt; } -Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) { ::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 8dd793e4212a..b910fb4997da 100644 --- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx +++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx @@ -152,7 +152,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) + const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::getColumns" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -241,7 +241,7 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( return xRef; } -OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::getURL" ); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 418431d0e730..31fbaea22f32 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -44,7 +44,7 @@ OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } @@ -55,7 +55,7 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } -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 ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -73,12 +73,12 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S } sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) + 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) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) { if ( acceptsURL(url) ) { diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index b9ce8bacc9e5..62c504f5b87b 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, ::getBooleanCppuType()); } -OUString SAL_CALL OFlatResultSet::getImplementationName( ) throw ( RuntimeException) +OUString SAL_CALL OFlatResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) { return OUString("com.sun.star.sdbcx.flat.ResultSet"); } -Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw( RuntimeException) +Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { if(rType == ::getCppuType((const Reference*)0) || rType == ::getCppuType((const Reference*)0) || rType == ::getCppuType((const Reference*)0)) @@ -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) +Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) throw( RuntimeException, std::exception) { Sequence< Type > aTypes = OResultSet::getTypes(); ::std::vector aOwnTypes; @@ -95,7 +95,7 @@ Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) throw( RuntimeException) // XRowLocate -Any SAL_CALL OFlatResultSet::getBookmark( ) throw( SQLException, RuntimeException) +Any SAL_CALL OFlatResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -103,7 +103,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) +sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -114,7 +114,7 @@ sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) throw( return Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),sal_True); } -sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -128,17 +128,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) +sal_Int32 SAL_CALL OFlatResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) { return (lhs == rhs) ? 0 : 2; } -sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) { return comphelper::getINT32(bookmark); } @@ -165,7 +165,7 @@ void SAL_CALL OFlatResultSet::release() throw() OFlatResultSet_BASE2::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 8a610d2dff03..cff9047c1575 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -542,7 +542,7 @@ void SAL_CALL OFlatTable::disposing(void) m_aColumns = NULL; } -Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException, std::exception) { Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); vector aOwnTypes; @@ -565,7 +565,7 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException) } -Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { if( rType == ::getCppuType((const Reference*)0) || rType == ::getCppuType((const Reference*)0) || @@ -596,7 +596,7 @@ Sequence< sal_Int8 > OFlatTable::getUnoTunnelImplementationId() // com::sun::star::lang::XUnoTunnel -sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::getSomething" ); return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index f2e5fae3cb0a..6e8714453f5c 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -125,7 +125,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) +Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { if ( rType == ::getCppuType((const Reference*)0) ) return Any(); @@ -133,7 +133,7 @@ Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeExcept return OCatalog::queryInterface(rType); } -Sequence< Type > SAL_CALL OHCatalog::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OHCatalog::getTypes( ) throw(RuntimeException, std::exception) { 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 16657cf227fb..088e277d7cc5 100644 --- a/connectivity/source/drivers/hsqldb/HColumns.cxx +++ b/connectivity/source/drivers/hsqldb/HColumns.cxx @@ -69,7 +69,7 @@ void OHSQLColumn::construct() return *OHSQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } -Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { Sequence< OUString > aSupported(1); aSupported[0] = "com.sun.star.sdbcx.Column"; diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index f9499d63f143..e8fe000a7feb 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -156,7 +156,7 @@ namespace connectivity { namespace hsqldb // XFlushable - void SAL_CALL OHsqlConnection::flush( ) throw (RuntimeException) + void SAL_CALL OHsqlConnection::flush( ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); @@ -194,21 +194,21 @@ namespace connectivity { namespace hsqldb } - void SAL_CALL OHsqlConnection::addFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException) + void SAL_CALL OHsqlConnection::addFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); m_aFlushListeners.addInterface( l ); } - void SAL_CALL OHsqlConnection::removeFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException) + void SAL_CALL OHsqlConnection::removeFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); m_aFlushListeners.removeInterface( l ); } - Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException) + Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException, std::exception) { MethodGuard aGuard( *this ); @@ -220,7 +220,7 @@ namespace connectivity { namespace hsqldb } - Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException) + Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { MethodGuard aGuard( *this ); diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 5bec011330bb..24327c59fd76 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -176,7 +176,7 @@ namespace connectivity } - Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) { Reference< XConnection > xConnection; if ( acceptsURL(url) ) @@ -395,7 +395,7 @@ namespace connectivity } - sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException) + sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception) { sal_Bool bEnabled = sal_False; javaFrameworkError e = jfw_getEnabled(&bEnabled); @@ -417,7 +417,7 @@ namespace connectivity } - Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException) + Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException, std::exception) { if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); @@ -447,19 +447,19 @@ namespace connectivity } - sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) throw (RuntimeException) + sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) throw (RuntimeException, std::exception) { return 1; } - sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) throw (RuntimeException) + sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) throw (RuntimeException, std::exception) { return 0; } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed); @@ -485,7 +485,7 @@ namespace connectivity } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) { if ( ! acceptsURL(url) ) { @@ -513,22 +513,22 @@ namespace connectivity return aSNS; } - OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } - void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, ::com::sun::star::container::ElementExistException, RuntimeException) + void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, ::com::sun::star::container::ElementExistException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XCreateCatalog::createCatalog", *this ); } @@ -568,7 +568,7 @@ namespace connectivity m_aConnections.erase(_aIter); } - void SAL_CALL ODriverDelegator::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException) + void SAL_CALL ODriverDelegator::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); Reference xCon(Source.Source,UNO_QUERY); @@ -634,7 +634,7 @@ namespace connectivity } } - void SAL_CALL ODriverDelegator::preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + void SAL_CALL ODriverDelegator::preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -675,15 +675,15 @@ namespace connectivity } } - void SAL_CALL ODriverDelegator::commited( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL ODriverDelegator::commited( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { } - void SAL_CALL ODriverDelegator::preRevert( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) + void SAL_CALL ODriverDelegator::preRevert( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) { } - void SAL_CALL ODriverDelegator::reverted( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException) + void SAL_CALL ODriverDelegator::reverted( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) { } diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 7a0515a2ecec..5151f4efa867 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -143,7 +143,7 @@ Sequence< sal_Int8 > OHSQLTable::getUnoTunnelImplementationId() // com::sun::star::lang::XUnoTunnel -sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { 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) +void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -340,7 +340,7 @@ void OHSQLTable::executeStatement(const OUString& _rStatement ) } } -Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException, std::exception) { if ( m_Type.equalsAscii("VIEW") ) { @@ -363,7 +363,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException) } // XRename -void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -399,7 +399,7 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, } -Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { if( m_Type.equalsAscii("VIEW") && rType == ::getCppuType((const Reference*)0) ) return Any(); diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx index 8eff0eb3836f..6b0c367d19a2 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx @@ -33,19 +33,19 @@ namespace connectivity // XEventListener void SAL_CALL OConnectionController::disposing( const EventObject& /*Source*/ ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { } // XTerminateListener void SAL_CALL OConnectionController::queryTermination( const EventObject& /*aEvent*/ ) -throw( TerminationVetoException, RuntimeException ) +throw( TerminationVetoException, RuntimeException, std::exception ) { m_pDriver->flushConnections(); } void SAL_CALL OConnectionController::notifyTermination( const EventObject& /*aEvent*/ ) -throw( RuntimeException ) +throw( RuntimeException, std::exception ) { m_pDriver->shutdownConnections(); } diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx index 712ced4c50cb..3c4da5efb915 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx @@ -41,13 +41,13 @@ namespace connectivity // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; } //........................................................................ diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index 3770eff149c6..64fdc4576d23 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) +sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -201,7 +201,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_In } } -sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -211,7 +211,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) +void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) { if ( objType != PrivilegeObject::TABLE ) { @@ -238,7 +238,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) +void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) { if ( objType != PrivilegeObject::TABLE ) { @@ -265,7 +265,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) +void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx index 45fc642fdf65..2bd26fcb232a 100644 --- a/connectivity/source/drivers/hsqldb/HView.cxx +++ b/connectivity/source/drivers/hsqldb/HView.cxx @@ -76,7 +76,7 @@ namespace connectivity { namespace hsqldb IMPLEMENT_FORWARD_XTYPEPROVIDER2( HView, HView_Base, HView_IBASE ) - void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException) + void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException, std::exception) { // not really atomic ... as long as we do not have something like // ALTER VIEW TO diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index d5c71fa8d4fc..2c54c4ee88ca 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); return callStringMethod("getBaseTypeName",mID); } -sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); return callIntMethod("getBaseType",mID); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL java_sql_Array::getArray( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL java_sql_Array::getArray( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -70,7 +70,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: return ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >(); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -88,7 +88,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: return ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >(); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -108,7 +108,7 @@ sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(::com::sun::star::sdbc: return NULL; } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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 5522de19aa90..2a5a96a7f416 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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(::com::sun::star::sdbc::SQLEx } //t.pEnv return (sal_Int64)out; } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -91,7 +91,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx return aSeq; } -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(NULL); @@ -100,7 +100,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(::com::sun::star::sdbc::SQLEx return out==0 ? 0 : new java_io_InputStream( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Blob::position( const ::com::sun::star::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL java_sql_Blob::position( const ::com::sun::star::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -122,7 +122,7 @@ sal_Int64 SAL_CALL java_sql_Blob::position( const ::com::sun::star::uno::Sequenc return (sal_Int64)out; } -sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "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 83ab8985f93b..762f2929d500 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -53,13 +53,13 @@ java_sql_CallableStatement::~java_sql_CallableStatement() } -Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = java_sql_PreparedStatement::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< starsdbc::XRow*>(this),static_cast< starsdbc::XOutParameters*>(this)); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XRow > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XOutParameters > *)0 )); @@ -67,7 +67,7 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) th return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes()); } -sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(starsdbc::SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -75,14 +75,14 @@ sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(starsdbc::SQLExc return callBooleanMethod( "wasNull", mID ); } -sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); static jmethodID mID(NULL); return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex ); } -sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -90,7 +90,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(starsdbc::SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -109,7 +109,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co } return aSeq; } -::com::sun::star::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +::com::sun::star::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -117,7 +117,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); return out ? static_cast (java_sql_Date( t.pEnv, out )) : ::com::sun::star::util::Date(); } -double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -126,7 +126,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(starsdbc::SQLException, RuntimeException) +float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -135,7 +135,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(starsdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -143,7 +143,7 @@ sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) t return callIntMethodWithIntArg("getInt",mID,columnIndex); } -sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -152,7 +152,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< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(starsdbc::SQLException, RuntimeException) +Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -162,7 +162,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(starsdbc::SQLException, RuntimeException) +sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -171,7 +171,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(starsdbc::SQLException, RuntimeException) +OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -181,7 +181,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return callStringMethodWithIntArg("getString",mID,columnIndex); } - ::com::sun::star::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) + ::com::sun::star::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -191,7 +191,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return out ? static_cast (java_sql_Time( t.pEnv, out )) : ::com::sun::star::util::Time(); } - ::com::sun::star::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) + ::com::sun::star::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -201,7 +201,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return out ? static_cast (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime(); } -void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(starsdbc::SQLException, RuntimeException) +void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(starsdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -222,7 +222,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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -251,18 +251,18 @@ jclass java_sql_CallableStatement::getMyClass() const return theClass; } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { Reference< starsdbc::XBlob > xBlob = getBlob(columnIndex); return xBlob.is() ? xBlob->getBinaryStream() : Reference< ::com::sun::star::io::XInputStream >(); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { Reference< starsdbc::XClob > xClob = getClob(columnIndex); return xClob.is() ? xClob->getCharacterStream() : Reference< ::com::sun::star::io::XInputStream >(); } -Reference< starsdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +Reference< starsdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -272,7 +272,7 @@ Reference< starsdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal return out==0 ? 0 : new java_sql_Array( t.pEnv, out ); } -Reference< starsdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +Reference< starsdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -281,7 +281,7 @@ Reference< starsdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_I // WARNING: the caller becomes the owner of the returned pointer return out==0 ? 0 : new java_sql_Clob( t.pEnv, out ); } -Reference< starsdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +Reference< starsdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -291,7 +291,7 @@ Reference< starsdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_I return out==0 ? 0 : new java_sql_Blob( t.pEnv, out ); } -Reference< starsdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException) +Reference< starsdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException, std::exception) { 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 5e1ecda71908..7bdcc27fb0c3 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::length" ); jlong out(0); @@ -66,7 +66,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(::com::sun::star::sdbc::SQLEx return (sal_Int64)out; } -OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::getSubString" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -86,7 +86,7 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin return aStr; } -::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::getCharacterStream" ); SDBThreadAttach t; @@ -97,7 +97,7 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin return out==0 ? 0 : new java_io_Reader( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::position" ); jlong out(0); @@ -120,7 +120,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 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_Clob::positionOfClob" ); ::dbtools::throwFeatureNotImplementedException( "XClob::positionOfClob", *this ); diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index f567486d1796..6c094ab9433c 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -74,7 +74,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) +Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callResultSetMethod( "getCatalogs", mID ); @@ -86,21 +86,21 @@ OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw( ) return impl_callStringMethod( "getCatalogSeparator", mID ); } -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); 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) + const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); 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) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getColumns", mID, catalog, schemaPattern, tableNamePattern, &columnNamePattern ); @@ -108,7 +108,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) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) throw(SQLException, RuntimeException, std::exception) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/sql/ResultSet;"; static const char * cMethodName = "getTables"; @@ -222,87 +222,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) + const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); 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) + catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); 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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getVersionColumns", mID, catalog, schema, table ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxBinaryLiteralLength", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxRowSize", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxCatalogNameLength", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxCharLiteralLength", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxColumnNameLength", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxColumnsInIndex", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxCursorNameLength", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxConnections", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxColumnsInTable", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxStatementLength", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxTableNameLength", mID ); @@ -315,21 +315,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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); 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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); 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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callResultSetMethodWithStrings( "getPrimaryKeys", mID, catalog, schema, table ); @@ -337,7 +337,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) + sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException, std::exception) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Ljava/sql/ResultSet;"; static const char * cMethodName = "getIndexInfo"; @@ -378,7 +378,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) + sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)Ljava/sql/ResultSet;"; static const char * cMethodName = "getBestRowIdentifier"; @@ -417,7 +417,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) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) { if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() ) return new OResultSetPrivileges(this,catalog,schemaPattern,tableNamePattern); @@ -495,7 +495,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) + const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception) { static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/ResultSet;"; static const char * cMethodName = "getCrossReference"; @@ -669,19 +669,19 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "doesMaxRowSizeIncludeBlobs", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "storesLowerCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "storesLowerCaseIdentifiers", mID ); @@ -693,19 +693,19 @@ sal_Bool java_sql_DatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( return impl_callBooleanMethod( "storesMixedCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "storesMixedCaseIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "storesUpperCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "storesUpperCaseIdentifiers", mID ); @@ -723,19 +723,19 @@ sal_Bool java_sql_DatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( return impl_callBooleanMethod( "supportsAlterTableWithDropColumn", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxIndexLength", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsNonNullableColumns", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); 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) +OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getExtraNameCharacters", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsDifferentTableCorrelationNames", mID ); @@ -765,67 +765,67 @@ sal_Bool java_sql_DatabaseMetaData::impl_isCatalogAtStart_throw( ) return impl_callBooleanMethod( "isCatalogAtStart", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "dataDefinitionIgnoredInTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "dataDefinitionCausesTransactionCommit", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsDataManipulationTransactionsOnly", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsDataDefinitionAndDataManipulationTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsPositionedDelete", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsPositionedUpdate", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsOpenStatementsAcrossRollback", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsOpenStatementsAcrossCommit", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsOpenCursorsAcrossCommit", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsOpenCursorsAcrossRollback", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "supportsTransactionIsolationLevel", mID, level ); @@ -837,25 +837,25 @@ sal_Bool java_sql_DatabaseMetaData::impl_supportsSchemasInDataManipulation_throw return impl_callBooleanMethod( "supportsSchemasInDataManipulation", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsANSI92FullSQL", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsANSI92EntryLevelSQL", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsIntegrityEnhancementFacility", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsSchemasInIndexDefinitions", mID ); @@ -873,7 +873,7 @@ sal_Bool java_sql_DatabaseMetaData::impl_supportsCatalogsInTableDefinitions_thro return impl_callBooleanMethod( "supportsCatalogsInTableDefinitions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsCatalogsInIndexDefinitions", mID ); @@ -885,13 +885,13 @@ sal_Bool java_sql_DatabaseMetaData::impl_supportsCatalogsInDataManipulation_thro return impl_callBooleanMethod( "supportsCatalogsInDataManipulation", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsOuterJoins", mID ); } -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callResultSetMethod( "getTableTypes", mID ); @@ -903,92 +903,92 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxStatements_throw( ) return impl_callIntMethod( "getMaxStatements", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxProcedureNameLength", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxSchemaNameLength", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "allProceduresAreCallable", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsStoredProcedures", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsSelectForUpdate", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "allTablesAreSelectable", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "isReadOnly", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "usesLocalFiles", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "usesLocalFilePerTable", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsTypeConversion", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "nullPlusNonNullIsNull", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsColumnAliasing", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsTableCorrelationNames", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException, std::exception) { static const char* 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) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsExpressionsInOrderBy", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsGroupBy", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsGroupByBeyondSelect", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsGroupByUnrelated", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsMultipleTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsMultipleResultSets", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsLikeEscapeClause", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsOrderByUnrelated", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsUnion", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsUnionAll", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsMixedCaseIdentifiers", mID ); @@ -1079,91 +1079,91 @@ sal_Bool java_sql_DatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_thro return impl_callBooleanMethod( "supportsMixedCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "nullsAreSortedAtEnd", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "nullsAreSortedAtStart", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "nullsAreSortedHigh", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "nullsAreSortedLow", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsSchemasInProcedureCalls", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsSchemasInPrivilegeDefinitions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsCatalogsInProcedureCalls", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsCatalogsInPrivilegeDefinitions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsCorrelatedSubqueries", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsSubqueriesInComparisons", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsSubqueriesInExists", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsSubqueriesInIns", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsSubqueriesInQuantifieds", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsANSI92IntermediateSQL", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL java_sql_DatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getUserName", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getDriverName", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getDriverVersion", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getDatabaseProductVersion", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getDatabaseProductName", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getProcedureTerm", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getSchemaTerm", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getDriverMajorVersion", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getDefaultTransactionIsolation", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getDriverMinorVersion", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getSQLKeywords", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getSearchStringEscape", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getStringFunctions", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getTimeDateFunctions", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getSystemFunctions", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callStringMethod( "getNumericFunctions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsExtendedSQLGrammar", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsCoreSQLGrammar", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsMinimumSQLGrammar", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsFullOuterJoins", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethod( "supportsLimitedOuterJoins", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxColumnsInGroupBy", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxColumnsInOrderBy", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxColumnsInSelect", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callIntMethod( "getMaxUserNameLength", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "supportsResultSetType", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException, std::exception) { static const char* 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) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "ownUpdatesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "ownDeletesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "ownInsertsAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "othersUpdatesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "othersDeletesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "othersInsertsAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "updatesAreDetected", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "deletesAreDetected", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return impl_callBooleanMethodWithIntArg( "insertsAreDetected", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); 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) + const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException, std::exception) { jobject out(0); 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 3ed09d08f1c5..e1991c56928c 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -54,29 +54,29 @@ jclass java_io_InputStream::getMyClass() const } -sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { return readBytes(aData,nMaxBytesToRead); } -void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); callIntMethodWithIntArg("skip",mID,nBytesToSkip); } -sal_Int32 SAL_CALL java_io_InputStream::available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_io_InputStream::available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); return callIntMethod("available",mID); } -void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); callVoidMethod("close",mID); } -sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { if (nBytesToRead < 0) throw ::com::sun::star::io::BufferSizeExceededException( OUString(THROW_WHERE), *this ); diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index 7de8a6b3814a..e4ff859485e0 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) +OUString SAL_CALL java_sql_Connection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) { ::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) +Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL java_sql_Connection::close( ) throw(SQLException, RuntimeException, std::exception) { dispose(); } -void SAL_CALL java_sql_Connection::commit( ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_Connection::commit( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); callVoidMethod("commit",mID); } -sal_Bool SAL_CALL java_sql_Connection::isClosed( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_Connection::isClosed( ) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL java_sql_Connection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); callVoidMethodWithStringArg("setCatalog",mID,catalog); } -void SAL_CALL java_sql_Connection::rollback( ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_Connection::rollback( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); callVoidMethod("rollback",mID); } -sal_Bool SAL_CALL java_sql_Connection::getAutoCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_Connection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return callBooleanMethod( "getAutoCommit", mID ); } -void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); callVoidMethodWithBoolArg("setReadOnly",mID,readOnly); } -void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); callVoidMethodWithBoolArg("setAutoCommit",mID,autoCommit); } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -422,7 +422,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connecti return 0; } -void SAL_CALL java_sql_Connection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_Connection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::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< ::com::sun::star } -sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { ::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("getTransactionIsolation",mID); } -void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) { ::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("setTransactionIsolation",mID,level); } -Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::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) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::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) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::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) +OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL java_sql_Connection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); callVoidMethod("clearWarnings",mID); } -Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::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 c1988f1ec5e9..b9ea306555a9 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -72,24 +72,24 @@ Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory))); } -OUString SAL_CALL java_sql_Driver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL java_sql_Driver::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } -sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, const - Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) + Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) { m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_CONNECTING_URL, url ); @@ -106,7 +106,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) +sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException, std::exception) { // don't ask the real driver for the url // I feel responsible for all jdbc url's @@ -129,7 +129,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) + const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) { if ( acceptsURL(url) ) { @@ -238,12 +238,12 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL java_sql_Driver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL java_sql_Driver::getMajorVersion( ) throw(RuntimeException, std::exception) { return 1; } -sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion( ) throw(RuntimeException, std::exception) { return 0; } diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 5eba3aeb92ac..958cd36f560e 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -119,7 +119,7 @@ void SAL_CALL OStatement_BASE2::release() throw() } -Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ) ) return Any(); @@ -127,7 +127,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) +Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) throw(RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), @@ -144,7 +144,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) +Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) throw (SQLException, RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINE, STR_LOG_GENERATED_VALUES ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -187,7 +187,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) -void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException) +void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -196,7 +196,7 @@ void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException) } -void SAL_CALL java_sql_Statement_Base::close( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL java_sql_Statement_Base::close( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -207,7 +207,7 @@ void SAL_CALL java_sql_Statement_Base::close( ) throw(::com::sun::star::sdbc::S } -void SAL_CALL java_sql_Statement::clearBatch( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL java_sql_Statement::clearBatch( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -219,7 +219,7 @@ void SAL_CALL java_sql_Statement::clearBatch( ) throw(::com::sun::star::sdbc::S } -sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_STATEMENT, sql ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -253,7 +253,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) +Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -288,7 +288,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OU return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this ); } -Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -296,14 +296,14 @@ Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) thr } -Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { 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(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -316,7 +316,7 @@ void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(::com::s } -Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -337,7 +337,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(::com: -sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -351,7 +351,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) } -Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -363,7 +363,7 @@ Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base } -sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -374,7 +374,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(::com::sun: } -sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return callBooleanMethod( "getMoreResults", mID ); @@ -382,7 +382,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) throw(::com::sun:: -Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { SDBThreadAttach t; createStatement(t.pEnv); @@ -400,7 +400,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(::com::sun::star::sd return Any(); } -void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) +void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -667,7 +667,7 @@ void java_sql_Statement_Base::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw (Exception) + throw (Exception, std::exception) { switch(nHandle) { @@ -822,7 +822,7 @@ void SAL_CALL java_sql_Statement::release() throw() OStatement_BASE2::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index f15bd4f45b7d..b821ff5e7a81 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -70,7 +70,7 @@ jclass java_sql_PreparedStatement::getMyClass() const } -::com::sun::star::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, @@ -80,7 +80,7 @@ jclass java_sql_PreparedStatement::getMyClass() const static_cast< XPreparedBatchExecution*>(this)); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ), ::getCppuType( (const ::com::sun::star::uno::Reference< XParameters > *)0 ), @@ -91,7 +91,7 @@ jclass java_sql_PreparedStatement::getMyClass() const } -sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -104,7 +104,7 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(::com::sun::star } -sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -117,7 +117,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(::com::su } -void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -139,13 +139,13 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return (Reference< XConnection >)m_pConnection; } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_QUERY ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -160,7 +160,7 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c } -void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex, bool(x) ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -173,7 +173,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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_BYTE_PARAMETER, parameterIndex, (sal_Int32)x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -186,7 +186,7 @@ void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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 ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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 ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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("setTimestamp", "(ILjava/sql/Timestamp;)V", mID, parameterIndex, aD.getJavaObject()); } -void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setClob", *this ); } -void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setBlob", *this ); } -void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setArray", *this ); } -void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setRef", *this ); } -void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -376,7 +376,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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -389,7 +389,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterInde } -void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -402,7 +402,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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_SHORT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -415,7 +415,7 @@ void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sa } -void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_BYTES_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -440,7 +440,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co } -void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_CHARSTREAM_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -488,7 +488,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete } -void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_BINARYSTREAM_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -537,7 +537,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn } -void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { m_aLogger.log( LogLevel::FINER, STR_LOG_CLEAR_PARAMETERS ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -552,7 +552,7 @@ void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(::com::sun:: } //t.pEnv } -void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -565,7 +565,7 @@ void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(::com::sun::star: } -void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -578,7 +578,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd } -::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -597,7 +597,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd return aSeq; } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ::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 1cf384c4ee31..3ae15ff50c39 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -44,18 +44,18 @@ jclass java_io_Reader::getMyClass() const return theClass; } -sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { return readBytes(aData,nMaxBytesToRead); } -void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); callIntMethodWithIntArg("skip",mID,nBytesToSkip); } -sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { jboolean out(sal_False); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -72,13 +72,13 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::Not return out; } -void SAL_CALL java_io_Reader::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_io_Reader::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); callVoidMethod("close",mID); } -sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { OSL_ENSURE(aData.getLength() < nBytesToRead," Sequence is smaller than BytesToRead"); jint out(0); diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx index cc7bbcd0a7a3..0c75d931db69 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); return callStringMethod("getBaseTypeName",mID); diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 6912fce9b990..b4acd4c54d5e 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -117,14 +117,14 @@ m_xMetaData.clear(); SDBThreadAttach::releaseRef(); } -::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::queryInterface" ); ::com::sun::star::uno::Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : java_sql_ResultSet_BASE::queryInterface(rType); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getTypes" ); ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), @@ -135,14 +135,14 @@ m_xMetaData.clear(); } -sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::findColumn" ); static jmethodID mID(NULL); return callIntMethodWithStringArg("findColumn",mID,columnName); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBinaryStream" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -153,7 +153,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get return out==0 ? 0 : new java_io_InputStream( t.pEnv, out ); } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getCharacterStream" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -165,7 +165,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get } -sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBoolean" ); static jmethodID mID(NULL); @@ -173,7 +173,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw( } -sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getByte" ); static jmethodID mID(NULL); @@ -182,7 +182,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) +Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBytes" ); Sequence< sal_Int8 > aSeq; @@ -200,7 +200,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde } -::com::sun::star::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getDate" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -211,7 +211,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde } -double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getDouble" ); static jmethodID mID(NULL); @@ -220,7 +220,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) +float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getFloat" ); static jmethodID mID(NULL); @@ -229,7 +229,7 @@ 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) +sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getInt" ); static jmethodID mID(NULL); @@ -237,7 +237,7 @@ sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQL } -sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getRow" ); static jmethodID mID(NULL); @@ -245,7 +245,7 @@ sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) throw(SQLException, RuntimeExc } -sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getLong" ); static jmethodID mID(NULL); @@ -254,7 +254,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getMetaData" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -264,7 +264,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection ); } -Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getArray" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -276,7 +276,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) +Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getClob" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -286,7 +286,7 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) return out==0 ? 0 : new java_sql_Clob( t.pEnv, out ); } -Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBlob" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -297,7 +297,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) +Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getRef" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -309,7 +309,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< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException) +Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getObject" ); jobject out(0); @@ -371,7 +371,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) +sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getShort" ); static jmethodID mID(NULL); @@ -381,7 +381,7 @@ 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) +OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getString" ); static jmethodID mID(NULL); @@ -390,7 +390,7 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S -::com::sun::star::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getTime" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -402,7 +402,7 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S -::com::sun::star::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getTimestamp" ); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -413,35 +413,35 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S } -sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isAfterLast" ); static jmethodID mID(NULL); return callBooleanMethod( "isAfterLast", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isFirst" ); static jmethodID mID(NULL); return callBooleanMethod( "isFirst", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::isLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isLast" ); static jmethodID mID(NULL); return callBooleanMethod( "isLast", mID ); } -void SAL_CALL java_sql_ResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_ResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::beforeFirst" ); static jmethodID mID(NULL); callVoidMethod("beforeFirst",mID); } -void SAL_CALL java_sql_ResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_ResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::afterLast" ); static jmethodID mID(NULL); @@ -449,14 +449,14 @@ void SAL_CALL java_sql_ResultSet::afterLast( ) throw(SQLException, RuntimeExcep } -void SAL_CALL java_sql_ResultSet::close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::close" ); dispose(); } -sal_Bool SAL_CALL java_sql_ResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::first( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::first" ); static jmethodID mID(NULL); @@ -464,56 +464,56 @@ sal_Bool SAL_CALL java_sql_ResultSet::first( ) throw(SQLException, RuntimeExcep } -sal_Bool SAL_CALL java_sql_ResultSet::last( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::last( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::last" ); static jmethodID mID(NULL); return callBooleanMethod( "last", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::absolute" ); static jmethodID mID(NULL); return callBooleanMethodWithIntArg( "absolute", mID,row ); } -sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::relative" ); static jmethodID mID(NULL); return callBooleanMethodWithIntArg( "relative", mID,row ); } -sal_Bool SAL_CALL java_sql_ResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::previous" ); static jmethodID mID(NULL); return callBooleanMethod( "previous", mID ); } -Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getStatement" ); return m_xStatement; } -sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::rowDeleted" ); static jmethodID mID(NULL); return callBooleanMethod( "rowDeleted", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::rowInserted" ); static jmethodID mID(NULL); return callBooleanMethod( "rowInserted", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::rowUpdated" ); static jmethodID mID(NULL); @@ -521,7 +521,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated( ) throw(SQLException, Runtime } -sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isBeforeFirst" ); static jmethodID mID(NULL); @@ -529,7 +529,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst( ) throw(SQLException, Runt } -sal_Bool SAL_CALL java_sql_ResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::next( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::next" ); static jmethodID mID(NULL); @@ -537,7 +537,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::next( ) throw(SQLException, RuntimeExcept } -sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::wasNull" ); static jmethodID mID(NULL); @@ -545,7 +545,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeExc } -void SAL_CALL java_sql_ResultSet::cancel( ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::cancel" ); static jmethodID mID(NULL); @@ -553,14 +553,14 @@ void SAL_CALL java_sql_ResultSet::cancel( ) throw(::com::sun::star::uno::Runtim } -void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::clearWarnings" ); static jmethodID mID(NULL); callVoidMethod("clearWarnings",mID); } -::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getWarnings" ); SDBThreadAttach t; @@ -579,21 +579,21 @@ void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc } -void SAL_CALL java_sql_ResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::insertRow" ); static jmethodID mID(NULL); callVoidMethod("insertRow",mID); } -void SAL_CALL java_sql_ResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateRow" ); static jmethodID mID(NULL); callVoidMethod("updateRow",mID); } -void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::deleteRow" ); static jmethodID mID(NULL); @@ -601,7 +601,7 @@ void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQ } -void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::cancelRowUpdates" ); static jmethodID mID(NULL); @@ -609,7 +609,7 @@ void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(::com::sun::star::s } -void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::moveToInsertRow" ); static jmethodID mID(NULL); @@ -617,7 +617,7 @@ void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(::com::sun::star::sd } -void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::moveToCurrentRow" ); static jmethodID mID(NULL); @@ -625,7 +625,7 @@ void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(::com::sun::star::s } -void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateNull" ); static jmethodID mID(NULL); @@ -633,14 +633,14 @@ void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(::co } -void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateBoolean" ); static jmethodID mID(NULL); callVoidMethod("updateBoolean", "(IZ)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateByte" ); static jmethodID mID(NULL); @@ -648,21 +648,21 @@ void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x } -void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateShort" ); static jmethodID mID(NULL); callVoidMethod("updateShort", "(IS)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateInt" ); static jmethodID mID(NULL); callVoidMethod("updateInt", "(II)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateLong" ); static jmethodID mID(NULL); @@ -671,7 +671,7 @@ void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x -void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateFloat" ); static jmethodID mID(NULL); @@ -679,7 +679,7 @@ void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) } -void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateDouble" ); static jmethodID mID(NULL); @@ -687,7 +687,7 @@ void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x } -void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateString" ); SDBThreadAttach t; @@ -715,7 +715,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUS } -void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateBytes" ); SDBThreadAttach t; @@ -744,7 +744,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co } -void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateDate" ); java_sql_Date aD(x); @@ -753,7 +753,7 @@ void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com } -void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateTime" ); java_sql_Time aD(x); @@ -762,7 +762,7 @@ void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com } -void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateTimestamp" ); java_sql_Timestamp aD(x); @@ -771,7 +771,7 @@ void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const } -void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateBinaryStream" ); try @@ -803,7 +803,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con } } -void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateCharacterStream" ); try @@ -835,7 +835,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, } } -void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateObject" ); if(!::dbtools::implUpdateObject(this,columnIndex,x)) @@ -850,7 +850,7 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c } -void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateNumericObject" ); // OSL_FAIL("java_sql_ResultSet::updateNumericObject: NYI"); @@ -936,7 +936,7 @@ void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) throw(::com::sun::st callVoidMethodWithIntArg("setFetchDirection",mID,_par0,true); } -void SAL_CALL java_sql_ResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL java_sql_ResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::refreshRow" ); static jmethodID mID(NULL); @@ -1002,7 +1002,7 @@ void java_sql_ResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception) + throw (::com::sun::star::uno::Exception, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::setFastPropertyValue_NoBroadcast" ); switch(nHandle) @@ -1064,7 +1064,7 @@ void SAL_CALL java_sql_ResultSet::release() throw() java_sql_ResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com 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 2e65be4f1ebf..48a8f0d8f699 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -57,7 +57,7 @@ jclass java_sql_ResultSetMetaData::getMyClass() const } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnDisplaySize" ); static jmethodID mID(NULL); @@ -65,7 +65,7 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 c } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnType" ); static jmethodID mID(NULL); @@ -73,7 +73,7 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnCount" ); if ( m_nColumnCount == -1 ) @@ -86,14 +86,14 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLExcep } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isCaseSensitive" ); static jmethodID mID(NULL); return callBooleanMethodWithIntArg( "isCaseSensitive", mID,column ); } -OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getSchemaName" ); static jmethodID mID(NULL); @@ -101,42 +101,42 @@ OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getColumnName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getTableName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getTableName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getCatalogName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getCatalogName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnTypeName" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getColumnTypeName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnLabel" ); static jmethodID mID(NULL); return callStringMethodWithIntArg("getColumnLabel",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnServiceName" ); static jmethodID mID(NULL); @@ -144,7 +144,7 @@ OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 co } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isCurrency" ); if ( m_pConnection->isIgnoreCurrencyEnabled() ) @@ -154,7 +154,7 @@ 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) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isAutoIncrement" ); static jmethodID mID(NULL); @@ -163,28 +163,28 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isSigned" ); static jmethodID mID(NULL); return callBooleanMethodWithIntArg( "isSigned", mID,column ); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getPrecision" ); static jmethodID mID(NULL); return callIntMethodWithIntArg("getPrecision",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getScale" ); static jmethodID mID(NULL); return callIntMethodWithIntArg("getScale",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isNullable" ); static jmethodID mID(NULL); @@ -192,7 +192,7 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) th } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isSearchable" ); static jmethodID mID(NULL); @@ -200,7 +200,7 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) t } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isReadOnly" ); static jmethodID mID(NULL); @@ -208,14 +208,14 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) thr } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isDefinitelyWritable" ); static jmethodID mID(NULL); return callBooleanMethodWithIntArg( "isDefinitelyWritable", mID,column ); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isWritable" ); static jmethodID mID(NULL); diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx index 3eee195ee388..818023d7ebb6 100644 --- a/connectivity/source/drivers/kab/KCatalog.cxx +++ b/connectivity/source/drivers/kab/KCatalog.cxx @@ -83,7 +83,7 @@ void KabCatalog::refreshUsers() // XTablesSupplier -Reference< XNameAccess > SAL_CALL KabCatalog::getTables( ) throw(RuntimeException) +Reference< XNameAccess > SAL_CALL KabCatalog::getTables( ) throw(RuntimeException, std::exception) { ::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 e73dd4b5b827..c7b69ee641c7 100644 --- a/connectivity/source/drivers/kab/KCatalog.hxx +++ b/connectivity/source/drivers/kab/KCatalog.hxx @@ -46,7 +46,7 @@ namespace connectivity // XTablesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( - ) throw(::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx index 32d1cae21522..8bc140ba0c5d 100644 --- a/connectivity/source/drivers/kab/KConnection.cxx +++ b/connectivity/source/drivers/kab/KConnection.cxx @@ -75,7 +75,7 @@ void KabConnection::construct(const OUString&, const Sequence< PropertyValue >&) } // XServiceInfo -Reference< XStatement > SAL_CALL KabConnection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL KabConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -87,7 +87,7 @@ Reference< XStatement > SAL_CALL KabConnection::createStatement( ) throw(SQLExc return xReturn; } -Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -99,7 +99,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const return xReturn; } -Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -108,7 +108,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUStr return NULL; } -OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -116,14 +116,14 @@ OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLExc return _sSql; } -void SAL_CALL KabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL KabConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -133,7 +133,7 @@ sal_Bool SAL_CALL KabConnection::getAutoCommit( ) throw(SQLException, RuntimeEx return sal_True; } -void SAL_CALL KabConnection::commit( ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::commit( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -141,7 +141,7 @@ void SAL_CALL KabConnection::commit( ) throw(SQLException, RuntimeException) // when you database does support transactions you should commit here } -void SAL_CALL KabConnection::rollback( ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -149,7 +149,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) +sal_Bool SAL_CALL KabConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -157,7 +157,7 @@ sal_Bool SAL_CALL KabConnection::isClosed( ) throw(SQLException, RuntimeExcepti return KabConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -174,7 +174,7 @@ Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData( ) throw(SQL return xMetaData; } -void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -182,7 +182,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) +sal_Bool SAL_CALL KabConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -191,7 +191,7 @@ sal_Bool SAL_CALL KabConnection::isReadOnly( ) throw(SQLException, RuntimeExcep return sal_False; } -void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -199,7 +199,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 kjnow what to do } -OUString SAL_CALL KabConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -209,7 +209,7 @@ OUString SAL_CALL KabConnection::getCatalog( ) throw(SQLException, RuntimeExcep return OUString(); } -void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -218,7 +218,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) +sal_Int32 SAL_CALL KabConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -228,7 +228,7 @@ sal_Int32 SAL_CALL KabConnection::getTransactionIsolation( ) throw(SQLException return TransactionIsolation::NONE; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -238,13 +238,13 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL KabConnection::ge return NULL; } -void SAL_CALL KabConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& ) throw(SQLException, RuntimeException, std::exception) { // the other way around } // XCloseable -void SAL_CALL KabConnection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -254,13 +254,13 @@ void SAL_CALL KabConnection::close( ) throw(SQLException, RuntimeException) } // XWarningsSupplier -Any SAL_CALL KabConnection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL KabConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL KabConnection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL KabConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { // you should clear your collected warnings here } diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index 0c3244355db7..f379a4051fb7 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -91,31 +91,31 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // needed for the SQL interpreter ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index b2481c458983..5e4b2fbaaf40 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx @@ -57,7 +57,7 @@ const OUString & KabDatabaseMetaData::getAddressBookTableName() return aAddressBookTableName; } -OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException, std::exception) { OUString aVal; if (m_bUseCatalog) @@ -67,73 +67,73 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) throw(SQLExceptio return aVal; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException, std::exception) { // 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 @@ -141,63 +141,63 @@ sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLExcept return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aVal; if (m_bUseCatalog) @@ -206,25 +206,25 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, Ru return aVal; } -OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException, std::exception) { // normally this is " OUString aVal("\""); return aVal; } -OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) { OUString aVal; return aVal; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, RuntimeException, std::exception) { sal_Bool bValue = sal_False; if (m_bUseCatalog) @@ -233,326 +233,326 @@ sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, return bValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; // should be supported at least } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { // for the moment, we have read-only addresses, but this might change in the future return sal_True; } -sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL KabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { // if someday we support more than the default address book, // this method should return the URL which was used to create it @@ -560,145 +560,145 @@ OUString SAL_CALL KabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeExc return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue( "kab" ); return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) { OUString aValue(KAB_DRIVER_VERSION); return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) { return KAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) { return KAB_DRIVER_VERSION_MINOR; } -OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { switch (setType) { @@ -709,7 +709,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { switch (setType) { @@ -720,62 +720,62 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 s return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException, std::exception) { return (Reference< XConnection >) m_xConnection.get(); } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; @@ -794,7 +794,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQ return xRef; } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) throw(SQLException, RuntimeException, std::exception) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo); Reference< XResultSet > xRef = pResult; @@ -831,19 +831,19 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) throw(SQLE return xRef; } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs ); } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges( const Any&, const OUString&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException) + const OUString& ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } @@ -852,7 +852,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( const Any&, const OUString&, const OUString& tableNamePattern, - const OUString& columnNamePattern) throw(SQLException, RuntimeException) + const OUString& columnNamePattern) throw(SQLException, RuntimeException, std::exception) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); Reference< XResultSet > xRef = pResult; @@ -922,7 +922,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( const Any&, const OUString&, const OUString&, - const Sequence< OUString >& types) throw(SQLException, RuntimeException) + const Sequence< OUString >& types) throw(SQLException, RuntimeException, std::exception) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables); Reference< XResultSet > xRef = pResult; @@ -971,20 +971,20 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns( const Any&, const OUString&, - const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures( const Any&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException) + const OUString& ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( - const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); @@ -1017,39 +1017,39 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo( const Any&, const OUString&, const OUString&, - sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) + sal_Bool, sal_Bool ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier( const Any&, const OUString&, const OUString&, sal_Int32, - sal_Bool ) throw(SQLException, RuntimeException) + sal_Bool ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } @@ -1057,12 +1057,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) + const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException, std::exception) { OSL_FAIL("Not implemented yet!"); throw SQLException(); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index 6cd891493889..10fbd9389088 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx @@ -47,155 +47,155 @@ namespace connectivity // this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogSeparator( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index ef551d500c2c..5b48222e1874 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -356,22 +356,22 @@ Sequence< OUString > KabDriver::getSupportedServiceNames_Static( ) throw (Runti return aSNS; } -OUString SAL_CALL KabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL KabDriver::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } -sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL KabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL KabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -395,7 +395,7 @@ Reference< XConnection > SAL_CALL KabDriver::connect( const OUString& url, const } sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) + throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -406,33 +406,33 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url ) return url.startsWith("sdbc:address:kab:"); } -Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException, std::exception) { // if you have something special to say, return it here :-) return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL KabDriver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL KabDriver::getMajorVersion( ) throw(RuntimeException, std::exception) { return KAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL KabDriver::getMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL KabDriver::getMinorVersion( ) throw(RuntimeException, std::exception) { return KAB_DRIVER_VERSION_MINOR; } -void SAL_CALL KabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException) +void SAL_CALL KabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException, std::exception) { // nothing to do, nothing to veto } -void SAL_CALL KabDriver::notifyTermination( const EventObject& ) throw (RuntimeException) +void SAL_CALL KabDriver::notifyTermination( const EventObject& ) throw (RuntimeException, std::exception) { m_aImplModule.shutdown(); } -void SAL_CALL KabDriver::disposing( const EventObject& ) throw (RuntimeException) +void SAL_CALL KabDriver::disposing( const EventObject& ) throw (RuntimeException, std::exception) { // not interested in (this is the disposing of the desktop, if any) } diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index 5b7614116a77..095aa11ca8c8 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -180,23 +180,23 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDriver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMajorVersion() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMinorVersion() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMajorVersion() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMinorVersion() throw(::com::sun::star::uno::RuntimeException, std::exception); // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); 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 fe9fd4952cab..53bd709615ff 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -108,7 +108,7 @@ void KabPreparedStatement::disposing() } } -Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException, std::exception) { ::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) +Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -167,7 +167,7 @@ Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQ return (Reference< XConnection >) m_pConnection; } -Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -187,7 +187,7 @@ 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) +void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException, std::exception) { @@ -195,7 +195,7 @@ void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OU ::dbtools::throwFunctionNotSupportedException("setObjectNull", NULL); } -void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException, std::exception) { @@ -203,7 +203,7 @@ void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLExc ::dbtools::throwFunctionNotSupportedException("setBoolean", NULL); } -void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException, std::exception) { @@ -211,7 +211,7 @@ void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLExcept ::dbtools::throwFunctionNotSupportedException("setByte", NULL); } -void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException, std::exception) { @@ -219,7 +219,7 @@ void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLExce ::dbtools::throwFunctionNotSupportedException("setShort", NULL); } -void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) { @@ -227,7 +227,7 @@ void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLExcept ::dbtools::throwFunctionNotSupportedException("setInt", NULL); } -void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException, std::exception) { @@ -235,7 +235,7 @@ void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLExcep ::dbtools::throwFunctionNotSupportedException("", NULL); } -void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException, std::exception) { @@ -243,7 +243,7 @@ void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLExceptio ::dbtools::throwFunctionNotSupportedException("setFloat", NULL); } -void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException, std::exception) { @@ -251,7 +251,7 @@ void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLExcept ::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } -void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -261,7 +261,7 @@ 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) +void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException, std::exception) { @@ -269,7 +269,7 @@ void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 ::dbtools::throwFunctionNotSupportedException("setBytes", NULL); } -void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException, std::exception) { @@ -277,7 +277,7 @@ void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLExc ::dbtools::throwFunctionNotSupportedException("setDate", NULL); } -void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException, std::exception) { @@ -285,7 +285,7 @@ void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLExc ::dbtools::throwFunctionNotSupportedException("setTime", NULL); } -void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException, std::exception) { @@ -293,7 +293,7 @@ void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) thr ::dbtools::throwFunctionNotSupportedException("setTimestamp", NULL); } -void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) { @@ -301,7 +301,7 @@ void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::dbtools::throwFunctionNotSupportedException("setBinaryStream", NULL); } -void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) { @@ -309,7 +309,7 @@ void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Referenc ::dbtools::throwFunctionNotSupportedException("setCharacterStream", NULL); } -void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException, std::exception) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -317,7 +317,7 @@ 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) +void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) { @@ -325,7 +325,7 @@ void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal ::dbtools::throwFunctionNotSupportedException("setObjectWithInfo", NULL); } -void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException, std::exception) { @@ -333,7 +333,7 @@ void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) ::dbtools::throwFunctionNotSupportedException("setRef", NULL); } -void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException, std::exception) { @@ -341,7 +341,7 @@ void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >& ::dbtools::throwFunctionNotSupportedException("setBlob", NULL); } -void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException, std::exception) { @@ -349,7 +349,7 @@ void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >& ::dbtools::throwFunctionNotSupportedException("setClob", NULL); } -void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException, std::exception) { @@ -357,12 +357,12 @@ void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray ::dbtools::throwFunctionNotSupportedException("setArray", NULL); } -void SAL_CALL KabPreparedStatement::clearParameters() throw(SQLException, RuntimeException) +void SAL_CALL KabPreparedStatement::clearParameters() throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException("clearParameters", NULL); } -void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) { switch (nHandle) { diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx index 5c0d274d10bb..52c8f1a1e75f 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.hxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx @@ -53,7 +53,7 @@ namespace connectivity protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); + const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception, std::exception); virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException); virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException); @@ -67,44 +67,44 @@ namespace connectivity virtual void SAL_CALL disposing(); // XPreparedStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); using KabCommonStatement::executeQuery; using KabCommonStatement::executeUpdate; using KabCommonStatement::execute; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index 1dbeabff6599..4b44e947c0c7 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) +Any SAL_CALL KabResultSet::queryInterface(const Type & rType) throw(RuntimeException, std::exception) { 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) +Sequence< Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std::exception) { OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet >*) 0), @@ -144,12 +144,12 @@ Sequence< Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException) return comphelper::concatSequences(aTypes.getTypes(), KabResultSet_BASE::getTypes()); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException, std::exception) { ::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) +OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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 sal_False; } -sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +float SAL_CALL KabResultSet::getFloat(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +double SAL_CALL KabResultSet::getDouble(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLException, RuntimeException, std::exception) { ::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) +Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -362,7 +362,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) thro return NULL; } -Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -372,7 +372,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) t return NULL; } -Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< ::com::sun::star::container::XNameAccess >&) throw(SQLException, RuntimeException) +Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< ::com::sun::star::container::XNameAccess >&) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -382,7 +382,7 @@ Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< ::com::sun::sta return Any(); } -Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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 NULL; } -Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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 NULL; } -Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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 NULL; } -Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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 NULL; } -Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -445,7 +445,7 @@ sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeExcep return sal_False; } -sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -457,7 +457,7 @@ sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeExcepti return sal_False; } -sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -468,7 +468,7 @@ sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException) return sal_False; } -sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -480,7 +480,7 @@ sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException) return sal_False; } -void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -499,7 +499,7 @@ void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException) m_nRowPos = nAddressees; } -void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -508,7 +508,7 @@ void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException) dispose(); } -sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -521,7 +521,7 @@ sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException) return sal_True; } -sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -534,7 +534,7 @@ sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException) return sal_True; } -sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) { ::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 sal_True; } -sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -572,7 +572,7 @@ sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException) return absolute(m_nRowPos + 1); } -sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException, std::exception) { ::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) +Reference< XInterface > SAL_CALL KabResultSet::getStatement() throw(SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -597,7 +597,7 @@ sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeExceptio return sal_False; } -sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -605,7 +605,7 @@ sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeExcepti return sal_False; } -sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -613,7 +613,7 @@ sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeExceptio return sal_False; } -sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL KabResultSet::cancel() throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::clearWarnings() throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::clearWarnings() throw(SQLException, RuntimeException, std::exception) { } -Any SAL_CALL KabResultSet::getWarnings() throw(SQLException, RuntimeException) +Any SAL_CALL KabResultSet::getWarnings() throw(SQLException, RuntimeException, std::exception) { return Any(); } -void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -644,7 +644,7 @@ void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException) // you only have to implement this if you want to insert new rows } -void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -652,19 +652,19 @@ void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException) // only when you allow updates } -void SAL_CALL KabResultSet::deleteRow() throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL KabResultSet::moveToCurrentRow() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException, std::exception) { checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL KabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) { checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL KabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date&) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date&) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateTime(sal_Int32, const cssu::Time&) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateTime(sal_Int32, const cssu::Time&) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL KabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::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) +void SAL_CALL KabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::refreshRow() throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::refreshRow() throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL KabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } // XRowLocate -Any SAL_CALL KabResultSet::getBookmark() throw( SQLException, RuntimeException) +Any SAL_CALL KabResultSet::getBookmark() throw( SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL KabResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception) { ::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 sal_False; } -sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException, std::exception) { ::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 sal_False; } -sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) throw( SQLException, RuntimeException, std::exception) { ::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) +sal_Bool SAL_CALL KabResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL KabResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL KabResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception) { ::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) +Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const Sequence< Any >&) throw( SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -931,7 +931,7 @@ sal_Bool KabResultSet::convertFastPropertyValue( void KabResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& ) - throw (Exception) + throw (Exception, std::exception) { switch (nHandle) { diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index f4071342e0aa..a681acfda8bf 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -79,7 +79,7 @@ namespace connectivity virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; @@ -109,110 +109,110 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XResultSet - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XRowLocate - virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& firstItem, const ::com::sun::star::uno::Any& secondItem ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& firstItem, const ::com::sun::star::uno::Any& secondItem ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XDeleteRows - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx index 2ef79e4fd606..70a760c1d901 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx @@ -52,32 +52,32 @@ void KabResultSetMetaData::setKabFields(const ::rtl::Reference SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), @@ -369,7 +369,7 @@ Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeExceptio return comphelper::concatSequences(aTypes.getTypes(),KabCommonStatement_BASE::getTypes()); } -void SAL_CALL KabCommonStatement::cancel( ) throw(RuntimeException) +void SAL_CALL KabCommonStatement::cancel( ) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -377,7 +377,7 @@ void SAL_CALL KabCommonStatement::cancel( ) throw(RuntimeException) // cancel the current sql statement } -void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException) +void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -388,7 +388,7 @@ void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException } sal_Bool SAL_CALL KabCommonStatement::execute( - const OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -399,7 +399,7 @@ sal_Bool SAL_CALL KabCommonStatement::execute( } Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery( - const OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -439,7 +439,7 @@ OSL_TRACE("KDE Address book - SQL Request: %s", OUtoCStr(sql)); return xRS; } -Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -448,7 +448,7 @@ Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQ return (Reference< XConnection >) m_pConnection; } -sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -457,7 +457,7 @@ sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQ return 0; } -Any SAL_CALL KabCommonStatement::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL KabCommonStatement::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -465,7 +465,7 @@ Any SAL_CALL KabCommonStatement::getWarnings( ) throw(SQLException, RuntimeExce return makeAny(m_aLastWarning); } -void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -510,7 +510,7 @@ sal_Bool KabCommonStatement::convertFastPropertyValue( return bConverted; } -void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception) +void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception, std::exception) { // set the value to whatever is necessary switch (nHandle) @@ -559,7 +559,7 @@ void SAL_CALL KabCommonStatement::release() throw() KabCommonStatement_BASE::release(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo( ) throw(RuntimeException) +Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index 3baadee733ea..a0e872d7988a 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -80,7 +80,7 @@ namespace connectivity const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); + const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception, std::exception); virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; @@ -104,39 +104,39 @@ namespace connectivity virtual void SAL_CALL acquire() throw(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType - ) throw(::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( - ) throw(::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( - ) throw(::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XStatement virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( - const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL executeUpdate( - const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL execute( - const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( - ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( - ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clearWarnings( - ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCancellable virtual void SAL_CALL cancel( - ) throw(::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XCloseable virtual void SAL_CALL close( - ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; //************************************************************** diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index 1426378f48dc..65abe020b35d 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -85,7 +85,7 @@ void OCatalog::refreshUsers() // XTablesSupplier -Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException) +Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException, std::exception) { ::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 672346717e42..a5f23f85f1f4 100644 --- a/connectivity/source/drivers/mork/MCatalog.hxx +++ b/connectivity/source/drivers/mork/MCatalog.hxx @@ -39,7 +39,7 @@ namespace connectivity virtual void refreshViews() ; virtual void refreshGroups(); virtual void refreshUsers() ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException, std::exception); public: OCatalog(OConnection* _pCon); diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 71b44a115648..a083d20910e8 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -177,7 +177,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) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OConnection::createStatement()" ); @@ -191,7 +191,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OConnection::prepareStatement()" ); SAL_INFO("connectivity.mork", "OConnection::prepareStatement( " << _sSql << " )"); @@ -211,7 +211,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OConnection::prepareCall()" ); SAL_INFO("connectivity.mork", "sql: " << _sSql); @@ -221,7 +221,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin return NULL; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OConnection::nativeSQL()" ); SAL_INFO("connectivity.mork", "sql: " << _sSql); @@ -233,12 +233,12 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLExcep return _sSql; } -void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setAutoCommit", *this ); } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) { // you have to distinguish which if you are in autocommit mode or not // at normal case true should be fine here @@ -246,17 +246,17 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return sal_True; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std::exception) { // when you database does support transactions you should commit here } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) { // same as commit but for the other case } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -264,7 +264,7 @@ sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException return OConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OConnection::getMetaData()" ); @@ -283,51 +283,51 @@ 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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setReadOnly", *this ); } -sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { // return if your connection to readonly return sal_False; } -void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setTransactionIsolation", *this ); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { // please have a look at @see com.sun.star.sdbc.TransactionIsolation return TransactionIsolation::NONE; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { // if your driver has special database types you can return it here return NULL; } -void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this ); } // XCloseable -void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std::exception) { // we just dispose us { @@ -339,13 +339,13 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { // you should clear your collected warnings here } diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 7a67ee5849fe..32b4a457857e 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -74,29 +74,29 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // XConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 94be41197400..4916f0bd56a1 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -153,55 +153,55 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) return OUString(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 65535; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 254; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 20; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; @@ -212,7 +212,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; @@ -225,17 +225,17 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -245,17 +245,17 @@ sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -270,18 +270,18 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return sal_False; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aVal; return aVal; @@ -293,13 +293,13 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return OUString( "\""); } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) { OUString aVal; return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } @@ -309,58 +309,58 @@ sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) { //We support create table return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -370,22 +370,22 @@ sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; // should be supported at least } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -400,7 +400,7 @@ sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -410,55 +410,55 @@ sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) { // We allow you to select from any table. return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { //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" @@ -466,93 +466,93 @@ sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeE return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) { // Support added for this. return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -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*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } @@ -563,277 +563,277 @@ sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) { OUString aValue = OUString::number(1); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue = OUString::number(0); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) { return 1; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -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*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_True; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } @@ -843,7 +843,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) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) { // there exists no possibility to get table types so we have to check static const OUString sTableTypes[] = @@ -919,7 +919,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) + const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -931,7 +931,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*/ ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTables()" ); // this returns an empty resultset where the column-names are already set @@ -956,7 +956,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) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTablePrivileges()" ); ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); @@ -1014,7 +1014,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) +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) { return NULL; } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index 05403795af5d..77ccd9bde825 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -66,131 +66,131 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getURL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getUserName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDatabaseProductName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDriverName( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDriverVersion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSystemFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSearchStringEscape( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSchemaTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getProcedureTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogTerm( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnion( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 11619f08487b..859f6e598677 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -53,19 +53,19 @@ css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames_Static( ) t } OUString SAL_CALL MorkDriver::getImplementationName() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return getImplementationName_Static(); } sal_Bool SAL_CALL MorkDriver::supportsService(const OUString& serviceName) - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames() - throw (css::uno::RuntimeException) + throw (css::uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -73,7 +73,7 @@ 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) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> MorkDriver::connect()" ); @@ -86,7 +86,7 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( } sal_Bool MorkDriver::acceptsURL(OUString const & url) - throw (css::sdbc::SQLException, css::uno::RuntimeException) + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> MorkDriver::acceptsURL()" ); // Skip 'sdbc:mozab: part of URL @@ -130,19 +130,19 @@ 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) + 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) { +sal_Int32 MorkDriver::getMajorVersion() throw (css::uno::RuntimeException, std::exception) { //... TODO return 0; } -sal_Int32 MorkDriver::getMinorVersion() throw (css::uno::RuntimeException) { +sal_Int32 MorkDriver::getMinorVersion() throw (css::uno::RuntimeException, std::exception) { //... TODO return 0; } diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index 04b7a2040b06..38c482b239e6 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -63,34 +63,34 @@ private: virtual ~MorkDriver() {} virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException); + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); 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); + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL acceptsURL( OUString const & url) - throw (css::sdbc::SQLException, css::uno::RuntimeException); + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception); 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); + throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getMajorVersion() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getMinorVersion() - throw (css::uno::RuntimeException); + throw (css::uno::RuntimeException, std::exception); css::uno::Reference< css::uno::XComponentContext > context_; css::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xFactory; diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 3cbc45d904e2..9a39670123ad 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -132,7 +132,7 @@ void SAL_CALL OPreparedStatement::release() throw() OCommonStatement::release(); } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OCommonStatement::queryInterface(rType); if(!aRet.hasValue()) @@ -140,13 +140,13 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt return aRet; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OPreparedStatement::getMetaData()" ); @@ -166,7 +166,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OPreparedStatement::execute()" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -177,7 +177,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OPreparedStatement::executeUpdate()" ); @@ -186,7 +186,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } -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 ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -196,7 +196,7 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -205,7 +205,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OPreparedStatement::executeQuery()" ); @@ -219,62 +219,62 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE } -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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setBoolean", *this ); } -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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setByte", *this ); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setDate", *this ); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setTime", *this ); } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setTimestamp", *this ); } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setDouble", *this ); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setFloat", *this ); } -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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setInt", *this ); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setLong", *this ); } -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*/ ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -285,78 +285,78 @@ 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) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setObjectWithInfo", *this ); } -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*/ ) throw(SQLException, RuntimeException, std::exception) { 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 ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::implSetObject(this,parameterIndex,x); } -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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setShort", *this ); } -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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setBytes", *this ); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setCharacterStream", *this ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setBinaryStream", *this ); } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) { } -void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) { switch(nHandle) { @@ -512,17 +512,17 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< scanParameter(pParseNode->getChild(i),_rParaNodes); } -::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return NULL; } -sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return 0; } -sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { return sal_False; } diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index 2a00a993d4e7..5f3bb904da06 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -71,7 +71,7 @@ namespace connectivity protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual ~OPreparedStatement(); virtual void SAL_CALL disposing(); @@ -100,47 +100,47 @@ namespace connectivity void lateInit(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPreparedStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL executeUpdate( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL execute( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearParameters( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XMultipleResults - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); public: using OCommonStatement::executeQuery; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index d2c4b1c610af..d361852deb5b 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -63,12 +63,12 @@ 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) \ +OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) \ { return OUString("com.sun.star.sdbcx.mork.ResultSet"); } - Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) { ::com::sun::star::uno::Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -76,7 +76,7 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException return aSupported; } -sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -136,7 +136,7 @@ void OResultSet::disposing(void) } } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OPropertySetHelper::queryInterface(rType); if(!aRet.hasValue()) @@ -144,7 +144,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep return aRet; } - Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException) + Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception) { OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), @@ -164,7 +164,7 @@ void OResultSet::methodEntry() } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -184,18 +184,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) +Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); m_bWasNull = sal_True; @@ -203,49 +203,49 @@ sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLE } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); return 0; } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); return Sequence< sal_Int8 >(); } -Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); return Date(); } -double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); return 0.0; } -float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); return 0; } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); return 0; } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -254,14 +254,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*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); return sal_Int64(); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -271,37 +271,37 @@ 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*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { return Any(); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { return 0; } @@ -422,7 +422,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI -OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -436,7 +436,7 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept } -Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); return Time(); @@ -444,14 +444,14 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLExceptio -DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); return DateTime(); } -sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -461,7 +461,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep return( m_nRowPos < 1 ); } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) { SAL_WARN("connectivity.mork", "OResultSet::isAfterLast() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -471,7 +471,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti return m_nRowPos > currentRowCount() && m_aQueryHelper.queryComplete(); } -sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -479,7 +479,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( ) throw(SQLException, RuntimeException, std::exception) { SAL_WARN("connectivity.mork", "OResultSet::isLast() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -489,7 +489,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) return m_nRowPos == currentRowCount() && m_aQueryHelper.queryComplete(); } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -499,7 +499,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) previous(); } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("In/Out: OResultSet::afterLast" ); @@ -509,46 +509,46 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OResultSet::close" ); dispose(); } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OResultSet::first" ); return seekRow( FIRST_POS ); } -sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OResultSet::last" ); return seekRow( LAST_POS ); } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OResultSet::absolute" ); return seekRow( ABSOLUTE_POS, row ); } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OResultSet::relative" ); return seekRow( RELATIVE_POS, row ); } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("In/Out: OResultSet::previous" ); return seekRow( PRIOR_POS ); } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -557,7 +557,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException } -sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) { SAL_WARN("connectivity.mork", "OResultSet::rowDeleted() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -565,7 +565,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio return sal_True;//return ((m_RowStates & RowStates_Deleted) == RowStates_Deleted) ; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) { SAL_WARN("connectivity.mork", "OResultSet::rowInserted() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -573,7 +573,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti return sal_True;//return ((m_RowStates & RowStates_Inserted) == RowStates_Inserted); } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) { SAL_WARN("connectivity.mork", "OResultSet::rowUpdated() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -582,13 +582,13 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception) { return seekRow( NEXT_POS ); } -sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -596,25 +596,25 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("In/Out: OResultSet::cancel" ); } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OResultSet::clearWarnings" ); } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OResultSet::getWarnings" ); return Any(); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("In/Out: OResultSet::refreshRow" ); if (fetchRow(getCurrentCardNumber(),sal_True)) { @@ -668,7 +668,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) - throw (Exception) + throw (Exception, std::exception) { OSL_FAIL( "OResultSet::setFastPropertyValue_NoBroadcast: not implemented!" ); switch(nHandle) @@ -722,7 +722,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -1570,7 +1570,7 @@ void OResultSet::setColumnMapping(const ::std::vector& _aColumnMappin } -::com::sun::star::uno::Any OResultSet::getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Any OResultSet::getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { OSL_TRACE("getBookmark, m_nRowPos = %u", m_nRowPos ); ResultSetEntryGuard aGuard( *this ); @@ -1581,7 +1581,7 @@ void OResultSet::setColumnMapping(const ::std::vector& _aColumnMappin OSL_ENSURE((!m_aRow->isDeleted()),"getBookmark called for deleted row"); return makeAny((sal_Int32)(m_aRow->get())[0]); } -sal_Bool OResultSet::moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Bool OResultSet::moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("moveToBookmark, bookmark = %u", comphelper::getINT32(bookmark) ); @@ -1590,7 +1590,7 @@ sal_Bool OResultSet::moveToBookmark( const ::com::sun::star::uno::Any& bookmark fetchCurrentRow(); return sal_True; } -sal_Bool OResultSet::moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Bool OResultSet::moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("moveRelativeToBookmark, bookmark = %u rows= %u", comphelper::getINT32(bookmark),rows ); @@ -1598,7 +1598,7 @@ sal_Bool OResultSet::moveRelativeToBookmark( const ::com::sun::star::uno::Any& m_nRowPos = getRowForCardNumber(nCardNum); return seekRow(RELATIVE_POS,rows ); } -sal_Int32 OResultSet::compareBookmarks( const ::com::sun::star::uno::Any& lhs, const ::com::sun::star::uno::Any& rhs ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 OResultSet::compareBookmarks( const ::com::sun::star::uno::Any& lhs, const ::com::sun::star::uno::Any& rhs ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("compareBookmarks, m_nRowPos = %u", m_nRowPos ); @@ -1619,13 +1619,13 @@ sal_Int32 OResultSet::compareBookmarks( const ::com::sun::star::uno::Any& lhs, c return nResult; } -sal_Bool OResultSet::hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Bool OResultSet::hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("hasOrderedBookmarks, m_nRowPos = %u", m_nRowPos ); return sal_True; } -sal_Int32 OResultSet::hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 OResultSet::hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("hashBookmark, m_nRowPos = %u", m_nRowPos ); @@ -1679,7 +1679,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("updateNull, m_nRowPos = %u", m_nRowPos ); ResultSetEntryGuard aGuard( *this ); @@ -1697,72 +1697,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 ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex, static_cast(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 ) throw(SQLException, RuntimeException, std::exception) { 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 ) throw(SQLException, RuntimeException, std::exception) { 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 ) throw(SQLException, RuntimeException, std::exception) { 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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateLong", *this ); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception) { 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 ) throw(SQLException, RuntimeException, std::exception) { 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 ) throw(SQLException, RuntimeException, std::exception) { 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 ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); @@ -1774,12 +1774,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateValue(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { updateBinaryStream(columnIndex,x,length); } -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 ) throw(SQLException, RuntimeException, std::exception) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { @@ -1792,7 +1792,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) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { @@ -1806,7 +1806,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& // XResultSetUpdate -void SAL_CALL OResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("insertRow in, m_nRowPos = %u", m_nRowPos ); @@ -1818,27 +1818,27 @@ void SAL_CALL OResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLExcepti OSL_TRACE("insertRow out, m_nRowPos = %u", m_nRowPos ); } -void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { OSL_FAIL( "OResultSet::updateRow( ) not implemented" ); } -void SAL_CALL OResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { OSL_FAIL( "OResultSet::deleteRow( ) not implemented" ); } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { OSL_FAIL( "OResultSet::cancelRowUpdates( ) not implemented" ); } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { OSL_FAIL( "OResultSet::moveToInsertRow( ) not implemented" ); } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +void SAL_CALL OResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("moveToCurrentRow, m_nRowPos = %u", m_nRowPos ); @@ -1883,7 +1883,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) +Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XDeleteRows::deleteRows", *this ); return Sequence< sal_Int32 >(); diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 8b0516b92f82..abb9e57c2595 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -103,7 +103,7 @@ namespace connectivity sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::Exception); + throw (::com::sun::star::uno::Exception, std::exception); virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle @@ -125,99 +125,99 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAfterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL beforeFirst( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL afterLast( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL first( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL last( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL previous( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL refreshRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowUpdated( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowInserted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL rowDeleted( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XResultSetMetaDataSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCancellable - virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XRowLocate - virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL compareBookmarks( const ::com::sun::star::uno::Any& first, const ::com::sun::star::uno::Any& second ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XDeleteRows - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); protected: //MQuery m_aQuery; diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx index 4aa8faec1542..0859aff8ba54 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx @@ -47,37 +47,37 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, throwInvalidIndexException(*this); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { return getPrecision(column); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return DataType::VARCHAR; // at the moment there exists only this type } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) { return static_cast((m_xColumns->get()).size()); } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return m_aTableName; } -OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { return getColumnName(column); } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { checkColumnIndex(column); sal_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) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { return !isReadOnly(column); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) { return !isReadOnly(column); } diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx index 9b94b2b718e8..612e09f6acfa 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx @@ -62,27 +62,27 @@ namespace connectivity { return this; } void checkColumnIndex(sal_Int32 column) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); }; } } diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 403ae0b648b7..bbed981b91c3 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -113,7 +113,7 @@ void OCommonStatement::disposing() OCommonStatement_IBASE::disposing(); } -Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OCommonStatement_IBASE::queryInterface(rType); if(!aRet.hasValue()) @@ -121,7 +121,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim return aRet; } -Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), @@ -130,7 +130,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) +void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -319,7 +319,7 @@ void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pR } -sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OCommonStatement::execute()" ); @@ -334,7 +334,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLExce } -Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OCommonStatement::executeQuery()" ); @@ -352,7 +352,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& } -Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OCommonStatement::getConnection()" ); @@ -363,7 +363,7 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLE return (Reference< XConnection >)m_pConnection; } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> OCommonStatement::queryInterface()" ); @@ -373,14 +373,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) +sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this ); return 0; } -Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -390,7 +390,7 @@ Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeExcept -void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -437,7 +437,7 @@ sal_Bool OCommonStatement::convertFastPropertyValue( return bConverted; } -void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) throw (Exception) +void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) throw (Exception, std::exception) { // set the value to whatever is necessary switch(nHandle) @@ -494,7 +494,7 @@ void SAL_CALL OStatement::release() throw() OCommonStatement::release(); } -Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException) +Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 84b0560eca65..c19567130e05 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -108,7 +108,7 @@ namespace connectivity throw (::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); + const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception, std::exception); virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; @@ -160,22 +160,22 @@ namespace connectivity virtual void SAL_CALL release() throw(); virtual void SAL_CALL acquire() throw(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) ; // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception); protected: using OPropertySetHelper::getFastPropertyValue; @@ -191,7 +191,7 @@ namespace connectivity OStatement( OConnection* _pConnection); DECLARE_SERVICE_INFO(); - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); }; diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index a59240723db4..292a936bb0d5 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -96,51 +96,51 @@ Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw } -OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } -sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } // XProfileDiscover -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_ProfileAccess->getProfileCount(product); } -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_ProfileAccess->getProfileList(product,list); } -OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_ProfileAccess->getDefaultProfile(product); } -OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_ProfileAccess->getProfilePath(product,profileName); } -::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_ProfileAccess->isProfileLocked(product,profileName); } -::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_ProfileAccess->getProfileExists(product,profileName); } // XProfileManager -::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->bootupProfile(product,profileName); @@ -150,7 +150,7 @@ OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::M return -1; #endif } -::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->shutdownProfile(); @@ -158,7 +158,7 @@ OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::M return -1; #endif } -::com::sun::star::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException) +::com::sun::star::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->getCurrentProduct(); @@ -166,7 +166,7 @@ OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::M return ::com::sun::star::mozilla::MozillaProductType_Default; #endif } -OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->getCurrentProfile(); @@ -174,7 +174,7 @@ OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::sta return OUString(); #endif } -::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException) +::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) { #ifndef MINIMAL_PROFILEDISCOVER return isProfileLocked(getCurrentProduct(),m_ProfileManager->getCurrentProfile()); @@ -182,7 +182,7 @@ OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (::com::sun::sta return true; #endif } -OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception) { #ifndef MINIMAL_PROFILEDISCOVER return m_ProfileManager->setCurrentProfile(product,profileName); @@ -194,7 +194,7 @@ OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla } // XProxyRunner -::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException) +::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException, std::exception) { #ifndef MINIMAL_PROFILEDISCOVER OUString profileName = aCode->getProfileName(); diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 05ac65bab150..78809b07fc4e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -57,30 +57,30 @@ namespace connectivity static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XMozillaBootstrap // XProfileDiscover - virtual ::sal_Int32 SAL_CALL getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< OUString >& list ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XProfileManager - virtual ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int32 SAL_CALL shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL shutdownProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCurrentProfile( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isCurrentProfileLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const OUString& profileName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XProxyRunner - virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException, std::exception); const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & getMSFactory(void) const { return m_xMSFactory; } diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index d70c750ecbea..5510faec0050 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -117,7 +117,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) +Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { if ( rType == ::getCppuType((const Reference*)0) ) return Any(); @@ -126,7 +126,7 @@ Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeEx return OCatalog::queryInterface(rType); } -Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) throw(RuntimeException, std::exception) { 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 d0dba8c9ca4e..ff93286f7ff4 100644 --- a/connectivity/source/drivers/mysql/YColumns.cxx +++ b/connectivity/source/drivers/mysql/YColumns.cxx @@ -69,7 +69,7 @@ void OMySQLColumn::construct() return *OMySQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } -Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { Sequence< OUString > aSupported(1); aSupported[0] = "com.sun.star.sdbcx.Column"; diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index f99166b1a641..0caa68e49981 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -253,7 +253,7 @@ namespace connectivity } - Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) { Reference< XConnection > xConnection; if ( acceptsURL(url) ) @@ -315,7 +315,7 @@ namespace connectivity } - sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException) + sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception) { Sequence< PropertyValue > info; @@ -328,7 +328,7 @@ namespace connectivity } - Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) { ::std::vector< DriverPropertyInfo > aDriverInfo; if ( !acceptsURL(url) ) @@ -386,19 +386,19 @@ namespace connectivity } - sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) throw (RuntimeException) + sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) throw (RuntimeException, std::exception) { return 1; } - sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) throw (RuntimeException) + sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) throw (RuntimeException, std::exception) { return 0; } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed); @@ -448,7 +448,7 @@ namespace connectivity } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) { if ( ! acceptsURL(url) ) { @@ -476,17 +476,17 @@ namespace connectivity return aSNS; } - OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException) + OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException) + sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index ba17a0993aac..dd827451284f 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -162,7 +162,7 @@ Sequence< sal_Int8 > OMySQLTable::getUnoTunnelImplementationId() // com::sun::star::lang::XUnoTunnel -sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) { 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) +void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index e3f760b76208..3f6edd363cf1 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) +sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -201,7 +201,7 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_I } } -sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -211,7 +211,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) +void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) { if ( objType != PrivilegeObject::TABLE ) { @@ -237,7 +237,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) +void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) { if ( objType != PrivilegeObject::TABLE ) { @@ -264,7 +264,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) +void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index 4ada11bb59f1..5bb4b86a2fd3 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -282,7 +282,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) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -292,7 +292,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -302,13 +302,13 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this ); return NULL; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -319,7 +319,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) +void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -331,7 +331,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) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -343,7 +343,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return nOption == SQL_AUTOCOMMIT_ON ; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -352,7 +352,7 @@ void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) 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) +void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -361,14 +361,14 @@ void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) 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) +sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -383,7 +383,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 ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -394,13 +394,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) +sal_Bool SAL_CALL OConnection::isReadOnly() throw(SQLException, RuntimeException, std::exception) { // const member which will initialized only once return m_bReadOnly; } -void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -412,7 +412,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) +OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -427,7 +427,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) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -439,7 +439,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) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -453,7 +453,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, return nTxn; } -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -462,13 +462,13 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getT return NULL; } -void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this ); } // XCloseable -void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std::exception) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -479,12 +479,12 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { } diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx index 0a9888d67ae9..5045213c9402 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) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) { 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) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException, std::exception) { 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) + const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { 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) + const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { 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) + const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception) { 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) + const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) { 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) + const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception) { 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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) { 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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { 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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { 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) + const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) { 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) + sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException, std::exception) { 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) + sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception) { 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) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) { 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) + const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); @@ -479,21 +479,21 @@ sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return nValue == SQL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); @@ -516,21 +516,21 @@ sal_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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) { OUString aVal; if(m_bUseCatalog) @@ -545,14 +545,14 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return aVal; } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); @@ -567,77 +567,77 @@ sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return nValue == SQL_CL_START; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_ISOLATION_OPTION,nValue,*this); @@ -651,28 +651,28 @@ sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return (nValue & SQL_SU_DML_STATEMENTS) == SQL_SU_DML_STATEMENTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this); return nValue == SQL_SC_SQL92_FULL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this); return nValue == SQL_SC_SQL92_ENTRY; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this); @@ -694,7 +694,7 @@ sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return (nValue & SQL_CU_TABLE_DEFINITION) == SQL_CU_TABLE_DEFINITION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue=0; if(m_bUseCatalog) @@ -710,14 +710,14 @@ sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return (nValue & SQL_CU_DML_STATEMENTS) == SQL_CU_DML_STATEMENTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { 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) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) { return m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException, std::exception) { if(fromType == toType) return sal_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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); @@ -1076,49 +1076,49 @@ sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return nValue == SQL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) { OUString aValue = m_pConnection->getURL(); if ( aValue.isEmpty() ) @@ -1193,91 +1193,91 @@ OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeExcep return aValue; } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue.copy(0,aValue.indexOf('.')).toInt32(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue.copy(0,aValue.lastIndexOf('.')).toInt32(); } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) { 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) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1338,7 +1338,7 @@ OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, return aValue.makeStringAndClear(); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1393,7 +1393,7 @@ OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException return aValue.makeStringAndClear(); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1412,7 +1412,7 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, return aValue.makeStringAndClear(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1473,7 +1473,7 @@ OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, return aValue.makeStringAndClear(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; if(m_bOdbc3) @@ -1488,7 +1488,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLExc } } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; if(m_bOdbc3) @@ -1503,7 +1503,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLExcepti } } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; if(m_bOdbc3) @@ -1518,54 +1518,54 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLExce } } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) { return supportsFullOuterJoins( ); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { 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) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1597,7 +1597,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set return bRet; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1619,7 +1619,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) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1641,7 +1641,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) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1663,42 +1663,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) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { return ownUpdatesAreVisible(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { return ownDeletesAreVisible(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) { return ownInsertsAreVisible(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) { return sal_False; } -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*/ ) throw(SQLException, RuntimeException, std::exception) { return NULL; } diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index e5b6535a6942..27ffcbb3cfcb 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -102,13 +102,13 @@ m_xMetaData.clear(); m_pConnection->release(); } -Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType); } -Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -123,7 +123,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw() ODatabaseMetaDataResultSet_BASE::release(); } -Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException) +Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException, std::exception) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), @@ -146,7 +146,7 @@ sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -193,20 +193,20 @@ template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::get } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getBinaryStream", *this ); return NULL; } -Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getCharacterStream", *this ); return NULL; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -235,13 +235,13 @@ 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 ) throw(SQLException, RuntimeException, std::exception) { return getInteger( columnIndex ); } -Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -270,7 +270,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co } -::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -292,7 +292,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co } -double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -309,7 +309,7 @@ double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) t } -float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -326,71 +326,71 @@ float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) thr } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getInteger( columnIndex ); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { return 0; } -sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getInteger( columnIndex ); } -Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); return m_xMetaData.is() ? m_xMetaData : (m_xMetaData = new OResultSetMetaData(m_pConnection,m_aStatementHandle)); } -Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getArray", *this ); return NULL; } -Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getClob", *this ); return NULL; } -Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getBlob", *this ); return NULL; } -Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getRef", *this ); return NULL; } -Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getObject", *this ); return Any(); } -sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getInteger( columnIndex ); } -OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -410,7 +410,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) -::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -428,7 +428,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) -::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -446,7 +446,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -456,7 +456,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException return m_nCurrentFetchState == SQL_NO_DATA; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -466,7 +466,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( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -476,7 +476,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) +void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -488,7 +488,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, Ru m_nCurrentFetchState = SQL_SUCCESS; } -void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -500,7 +500,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, Runt } -void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException, std::exception) { { @@ -512,7 +512,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -529,7 +529,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( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -544,7 +544,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, Runti return bRet; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -560,7 +560,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) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -576,7 +576,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( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -594,13 +594,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( ) throw(SQLException, RuntimeException, std::exception) { return NULL; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -610,7 +610,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) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -619,7 +619,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) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -630,7 +630,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -641,7 +641,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLExcepti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -660,7 +660,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( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -670,7 +670,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru return m_bWasNull; } -void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -679,7 +679,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, Run } -void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException, std::exception) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -689,11 +689,11 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException) OTools::ThrowException(m_pConnection,N3SQLCancel(m_aStatementHandle),m_aStatementHandle,SQL_HANDLE_STMT,*this); } -void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) { } -Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) { return Any(); } @@ -768,7 +768,7 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( return sal_False; } -void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) throw (Exception) +void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) throw (Exception, std::exception) { switch(nHandle) { diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index d82362129042..b6ead37a90e1 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -73,24 +73,24 @@ Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static( ) throw (Runt } -OUString SAL_CALL ODBCDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODBCDriver::getImplementationName( ) throw(RuntimeException, std::exception) { return getImplementationName_Static(); } -sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) { if ( ! acceptsURL(url) ) return NULL; @@ -110,12 +110,12 @@ Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, cons } sal_Bool SAL_CALL ODBCDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) + 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) +Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) { if ( acceptsURL(url) ) { @@ -197,12 +197,12 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL ODBCDriver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODBCDriver::getMajorVersion( ) throw(RuntimeException, std::exception) { return 1; } -sal_Int32 SAL_CALL ODBCDriver::getMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODBCDriver::getMinorVersion( ) throw(RuntimeException, std::exception) { return 0; } diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 49aa2fd2aa28..5cdc80760433 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -102,19 +102,19 @@ void SAL_CALL OPreparedStatement::release() throw() OStatement_BASE2::release(); } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : OPreparedStatement_BASE::queryInterface(rType); } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OStatement_BASE2::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -128,7 +128,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr } -void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -153,7 +153,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -219,7 +219,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -242,13 +242,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } -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 ) throw(SQLException, RuntimeException, std::exception) { setParameter(parameterIndex, DataType::CHAR, invalid_scale, x); } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -257,7 +257,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -277,7 +277,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE } -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 ) throw(SQLException, RuntimeException, std::exception) { // Set the parameter as if it were an integer setInt (parameterIndex, x ? 1 : 0 ); @@ -394,7 +394,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_ OTools::ThrowException(m_pConnection, nRetcode, m_aStatementHandle, SQL_HANDLE_STMT, *this); } -void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const sal_Int8 x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) { setScalarParameter(parameterIndex, DataType::TINYINT, 3, x); } @@ -403,14 +403,14 @@ void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const // uncomment if necessary (safe also on compilers that *do* support partial specialisation) //BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(DATE_STRUCT); //BOOST_STATIC_ASSERT((boost::is_same::type>::value)); -void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) throw(SQLException, RuntimeException, std::exception) { DATE_STRUCT x(OTools::DateToOdbcDate(aData)); setScalarParameter(parameterIndex, DataType::DATE, 10, x); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& aVal ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& aVal ) throw(SQLException, RuntimeException, std::exception) { SQLULEN nColSize; if(aVal.NanoSeconds == 0) @@ -438,7 +438,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) throw(SQLException, RuntimeException, std::exception) { SQLULEN nColSize; if(aVal.NanoSeconds == 0) @@ -472,26 +472,26 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception) { setScalarParameter(parameterIndex, DataType::DOUBLE, 15, x); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) { setScalarParameter(parameterIndex, DataType::FLOAT, 15, 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 ) throw(SQLException, RuntimeException, std::exception) { setScalarParameter(parameterIndex, DataType::INTEGER, 10, 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 ) throw(SQLException, RuntimeException, std::exception) { try { @@ -504,7 +504,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) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_Int32 _nType ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); setParameterPre(parameterIndex); @@ -538,32 +538,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) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException, std::exception) { 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) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException, std::exception) { 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) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XParameters::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 ) throw(SQLException, RuntimeException, std::exception) { checkDisposed(OStatement_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -604,13 +604,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) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception) { 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 ) throw(SQLException, RuntimeException, std::exception) { if (!::dbtools::implSetObject(this, parameterIndex, x)) { // there is no other setXXX call which can handle the value in x @@ -619,20 +619,20 @@ 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 ) throw(SQLException, RuntimeException, std::exception) { setScalarParameter(parameterIndex, DataType::SMALLINT, 5, 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 ) throw(SQLException, RuntimeException, std::exception) { setParameter(parameterIndex, DataType::BINARY, x); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { // LEM: It is quite unclear to me what the interface here is. // The XInputStream provides *bytes*, not characters. @@ -640,13 +640,13 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) { setStream(parameterIndex, x, length, DataType::LONGVARBINARY); } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); prepareStatement(); @@ -656,7 +656,7 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim OSL_UNUSED(nRet); } -void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XPreparedBatchExecution::clearBatch", *this ); // clearParameters( ); @@ -664,13 +664,13 @@ void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeExce } -void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XPreparedBatchExecution::addBatch", *this ); } -Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XPreparedBatchExecution::executeBatch", *this ); // not reached, but keep -Werror happy @@ -880,7 +880,7 @@ void OPreparedStatement::FreeParams() boundParams = NULL; } -void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) { try { diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 13040a0cf95c..c2394d0d1ff3 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -66,12 +66,12 @@ namespace // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) +OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) { return OUString("com.sun.star.sdbcx.odbc.ResultSet"); } - Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -79,7 +79,7 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException return aSupported; } -sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -358,13 +358,13 @@ void OResultSet::releaseBuffer() m_aLengthVector.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException) + Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception) { OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), @@ -374,7 +374,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::findColumn" ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -427,7 +427,7 @@ void OResultSet::invalidateCache() } } -Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -437,7 +437,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*colu return NULL; } -Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -470,18 +470,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) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ); } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -534,34 +534,34 @@ 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) +Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ); } -double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ); } -float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ); } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ); } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ); } @@ -577,7 +577,7 @@ sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) throw(SQLException, } } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -585,7 +585,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) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) { SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::getMetaData" ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -597,7 +597,7 @@ 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*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getArray", *this ); return NULL; @@ -605,27 +605,27 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) t -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getClob", *this ); return NULL; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getBlob", *this ); return NULL; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedException( "XRow::getRef", *this ); return NULL; } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ).makeAny(); } @@ -636,7 +636,7 @@ OUString OResultSet::impl_getString( sal_Int32 columnIndex ) throw(SQLException, 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) +OUString OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue( columnIndex ); } @@ -648,7 +648,7 @@ Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException, Runti return Time(0, aTime.second,aTime.minute,aTime.hour, false); } -Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) { return getValue