[Libreoffice-commits] core.git: 3 commits - avmedia/source basctl/source basic/source canvas/source canvas/workben chart2/qa chart2/source cli_ure/source comphelper/source connectivity/source cppcanvas/source cpputools/source cui/source dbaccess/source desktop/source drawinglayer/source embeddedobj/source extensions/source filter/source forms/source framework/source include/com oox/source reportdesign/source sc/qa scripting/source sc/source sdext/source sd/qa sd/source sfx2/source slideshow/source svl/source svtools/source svx/source sw/qa sw/source test/source toolkit/qa toolkit/source unoxml/source vbahelper/source vcl/qa vcl/source vcl/unx writerfilter/source writerperfect/qa writerperfect/source xmloff/source xmlsecurity/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Mon May 13 06:16:33 UTC 2019
avmedia/source/framework/mediaitem.cxx | 2
avmedia/source/framework/soundhandler.cxx | 2
basctl/source/basicide/scriptdocument.cxx | 18 +--
basctl/source/dlged/propbrw.cxx | 2
basic/source/basmgr/vbahelper.cxx | 2
basic/source/uno/namecont.cxx | 4
canvas/source/tools/canvastools.cxx | 2
canvas/workben/canvasdemo.cxx | 6 -
chart2/qa/extras/PivotChartTest.cxx | 10 -
chart2/qa/extras/chart2dump/chart2dump.cxx | 8 -
chart2/qa/extras/chart2export.cxx | 12 +-
chart2/qa/extras/chart2import.cxx | 48 ++++----
chart2/qa/extras/charttest.hxx | 6 -
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 4
chart2/source/controller/main/ChartController.cxx | 4
chart2/source/controller/main/UndoCommandDispatch.cxx | 2
chart2/source/model/filter/XMLFilter.cxx | 2
chart2/source/tools/RegressionCurveCalculator.cxx | 2
cli_ure/source/climaker/climaker_emit.cxx | 2
comphelper/source/misc/documentinfo.cxx | 2
comphelper/source/misc/storagehelper.cxx | 2
connectivity/source/commontools/dbtools2.cxx | 4
connectivity/source/commontools/formattedcolumnvalue.cxx | 6 -
connectivity/source/commontools/paramwrapper.cxx | 2
connectivity/source/commontools/statementcomposer.cxx | 2
connectivity/source/drivers/hsqldb/HConnection.cxx | 14 +-
connectivity/source/drivers/hsqldb/HView.cxx | 2
connectivity/source/drivers/mork/MResultSetMetaData.cxx | 2
cppcanvas/source/mtfrenderer/textaction.cxx | 2
cpputools/source/unoexe/unoexe.cxx | 2
cui/source/customize/acccfg.cxx | 6 -
cui/source/customize/cfg.cxx | 2
cui/source/dialogs/SignatureLineDialog.cxx | 4
cui/source/dialogs/scriptdlg.cxx | 2
dbaccess/source/core/api/HelperCollections.cxx | 2
dbaccess/source/core/api/KeySet.cxx | 2
dbaccess/source/core/api/RowSet.cxx | 12 +-
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 8 -
dbaccess/source/core/api/definitioncolumn.cxx | 4
dbaccess/source/core/api/query.cxx | 4
dbaccess/source/core/dataaccess/ModelImpl.cxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 4
dbaccess/source/core/dataaccess/documentdefinition.cxx | 4
dbaccess/source/core/misc/ContainerMediator.cxx | 2
dbaccess/source/core/misc/objectnameapproval.cxx | 2
dbaccess/source/core/recovery/dbdocrecovery.cxx | 2
dbaccess/source/core/recovery/storagestream.cxx | 2
dbaccess/source/core/recovery/storagexmlstream.cxx | 2
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 4
dbaccess/source/ext/macromigration/migrationengine.cxx | 16 +-
dbaccess/source/filter/xml/dbloader2.cxx | 2
dbaccess/source/filter/xml/xmlfilter.cxx | 2
dbaccess/source/sdbtools/connection/objectnames.cxx | 8 -
dbaccess/source/sdbtools/connection/tablename.cxx | 2
dbaccess/source/ui/app/AppControllerGen.cxx | 8 -
dbaccess/source/ui/browser/unodatbr.cxx | 6 -
dbaccess/source/ui/control/tabletree.cxx | 8 -
dbaccess/source/ui/dlg/adtabdlg.cxx | 4
dbaccess/source/ui/dlg/dlgsave.cxx | 2
dbaccess/source/ui/dlg/queryorder.cxx | 2
dbaccess/source/ui/misc/WCopyTable.cxx | 4
dbaccess/source/ui/misc/databaseobjectview.cxx | 2
dbaccess/source/ui/querydesign/QueryTableView.cxx | 4
dbaccess/source/ui/querydesign/TableWindowData.cxx | 4
dbaccess/source/ui/uno/copytablewizard.cxx | 4
desktop/source/app/dispatchwatcher.cxx | 2
desktop/source/app/opencl.cxx | 2
desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 2
desktop/source/deployment/registry/component/dp_component.cxx | 2
desktop/source/migration/migration.cxx | 4
drawinglayer/source/primitive2d/animatedprimitive2d.cxx | 2
embeddedobj/source/general/docholder.cxx | 4
extensions/source/logging/loggerconfig.cxx | 2
extensions/source/logging/loghandler.cxx | 8 -
extensions/source/propctrlr/browserline.cxx | 4
extensions/source/propctrlr/defaulthelpprovider.cxx | 2
extensions/source/propctrlr/eventhandler.cxx | 6 -
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/genericpropertyhandler.cxx | 2
extensions/source/propctrlr/sqlcommanddesign.cxx | 6 -
extensions/source/update/check/updatehdl.cxx | 6 -
filter/source/msfilter/mstoolbar.cxx | 4
filter/source/msfilter/msvbahelper.cxx | 6 -
filter/source/svg/svgexport.cxx | 4
filter/source/svg/svgfilter.cxx | 8 -
filter/source/svg/svgwriter.cxx | 4
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/cachedrowset.cxx | 2
forms/source/component/propertybaghelper.cxx | 10 -
framework/source/fwe/helper/documentundoguard.cxx | 2
framework/source/services/autorecovery.cxx | 4
framework/source/services/frame.cxx | 4
include/com/sun/star/uno/Reference.h | 12 ++
oox/source/docprop/ooxmldocpropimport.cxx | 2
oox/source/ole/vbaproject.cxx | 2
oox/source/ppt/presentationfragmenthandler.cxx | 6 -
oox/source/ppt/timenode.cxx | 6 -
reportdesign/source/core/sdr/formatnormalizer.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 2
reportdesign/source/ui/report/propbrw.cxx | 2
sc/qa/extras/scannotationobj.cxx | 4
sc/qa/extras/scannotationsobj.cxx | 2
sc/qa/extras/scautoformatsobj.cxx | 2
sc/qa/extras/sccellfieldsobj.cxx | 4
sc/qa/extras/sccellformatsenumeration.cxx | 4
sc/qa/extras/sccellformatsobj.cxx | 2
sc/qa/extras/sccellobj.cxx | 6 -
sc/qa/extras/sccellrangeobj.cxx | 4
sc/qa/extras/sccellrangesobj.cxx | 2
sc/qa/extras/sccellsearchobj.cxx | 2
sc/qa/extras/sccellsenumeration.cxx | 10 -
sc/qa/extras/sccellsobj.cxx | 10 -
sc/qa/extras/scchartobj.cxx | 4
sc/qa/extras/scchartsobj.cxx | 4
sc/qa/extras/scdatapilotfieldgroupitemobj.cxx | 10 -
sc/qa/extras/scdatapilotfieldgroupobj.cxx | 10 -
sc/qa/extras/scdatapilotfieldgroupsobj.cxx | 10 -
sc/qa/extras/scdatapilotfieldobj.cxx | 4
sc/qa/extras/scdatapilotfieldsobj.cxx | 6 -
sc/qa/extras/scdatapilotitemobj.cxx | 8 -
sc/qa/extras/scdatapilotitemsobj.cxx | 9 -
sc/qa/extras/scdatapilottablesobj.cxx | 8 -
sc/qa/extras/scddelinkobj.cxx | 2
sc/qa/extras/scddelinksobj.cxx | 2
sc/qa/extras/scdrawpageobj.cxx | 6 -
sc/qa/extras/scdrawpagesobj.cxx | 2
sc/qa/extras/sceditfieldobj-header.cxx | 2
sc/qa/extras/scheaderfieldsobj.cxx | 4
sc/qa/extras/scheaderfootercontentobj.cxx | 2
sc/qa/extras/scimportdescriptorbaseobj.cxx | 4
sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx | 6 -
sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx | 6 -
sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx | 6 -
sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx | 6 -
sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx | 2
sc/qa/extras/scindexenumeration_scenariosenumeration.cxx | 4
sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx | 2
sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx | 2
sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx | 2
sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx | 2
sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx | 4
sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx | 4
sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx | 4
sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx | 2
sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx | 7 -
sc/qa/extras/scindexenumeration_textfieldenumeration.cxx | 6 -
sc/qa/extras/scmodelobj.cxx | 2
sc/qa/extras/scpdfexport.cxx | 6 -
sc/qa/extras/scsheetlinkobj.cxx | 2
sc/qa/extras/scsheetlinksobj.cxx | 2
sc/qa/extras/scsortdescriptorbaseobj.cxx | 2
sc/qa/extras/scstylefamiliesobj.cxx | 2
sc/qa/extras/scstylefamilyobj.cxx | 4
sc/qa/extras/sctablecolumnobj.cxx | 4
sc/qa/extras/sctablecolumnsobj.cxx | 4
sc/qa/extras/sctablerowobj.cxx | 4
sc/qa/extras/sctablerowsobj.cxx | 6 -
sc/qa/extras/sctablesheetobj.cxx | 6 -
sc/qa/extras/sctabviewobj.cxx | 2
sc/qa/extras/scuniquecellformatsenumeration.cxx | 4
sc/qa/extras/scuniquecellformatsobj.cxx | 2
sc/qa/extras/scviewpaneobj.cxx | 6 -
sc/source/filter/excel/xltoolbar.cxx | 2
sc/source/filter/oox/workbookhelper.cxx | 2
sc/source/filter/oox/worksheetbuffer.cxx | 2
sc/source/filter/xml/xmlimprt.cxx | 2
sc/source/ui/docshell/docsh.cxx | 4
sc/source/ui/docshell/docsh4.cxx | 2
sc/source/ui/docshell/macromgr.cxx | 2
sc/source/ui/unoobj/servuno.cxx | 2
sc/source/ui/vba/excelvbahelper.cxx | 4
sc/source/ui/vba/vbaapplication.cxx | 14 +-
sc/source/ui/vba/vbaaxes.cxx | 2
sc/source/ui/vba/vbacharacters.cxx | 2
sc/source/ui/vba/vbacomment.cxx | 8 -
sc/source/ui/vba/vbaeventshelper.cxx | 2
sc/source/ui/vba/vbaglobals.cxx | 2
sc/source/ui/vba/vbahyperlinks.cxx | 10 -
sc/source/ui/vba/vbainterior.cxx | 4
sc/source/ui/vba/vbanames.cxx | 2
sc/source/ui/vba/vbaoleobject.cxx | 4
sc/source/ui/vba/vbaoleobjects.cxx | 2
sc/source/ui/vba/vbapagesetup.cxx | 2
sc/source/ui/vba/vbarange.cxx | 58 +++++-----
sc/source/ui/vba/vbawindow.cxx | 2
sc/source/ui/vba/vbaworkbook.cxx | 6 -
sc/source/ui/vba/vbaworksheet.cxx | 32 ++---
sc/source/ui/vba/vbaworksheets.cxx | 6 -
sc/source/ui/vba/vbawsfunction.cxx | 2
scripting/source/dlgprov/DialogModelProvider.cxx | 2
scripting/source/dlgprov/dlgprov.cxx | 6 -
scripting/source/protocolhandler/scripthandler.cxx | 2
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 2
scripting/source/provider/MasterScriptProvider.cxx | 6 -
scripting/source/provider/MasterScriptProviderFactory.cxx | 2
sd/qa/unit/export-tests-ooxml1.cxx | 6 -
sd/qa/unit/export-tests-ooxml2.cxx | 4
sd/qa/unit/import-tests.cxx | 18 +--
sd/qa/unit/misc-tests.cxx | 2
sd/source/core/CustomAnimationCloner.cxx | 2
sd/source/core/CustomAnimationEffect.cxx | 34 ++---
sd/source/core/TransitionPreset.cxx | 4
sd/source/filter/eppt/pptexanimations.cxx | 10 -
sd/source/filter/xml/sdxmlwrp.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/animations/CustomAnimationList.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 4
sd/source/ui/dlg/filedlg.cxx | 2
sd/source/ui/func/fusel.cxx | 2
sd/source/ui/remotecontrol/ImagePreparer.cxx | 2
sd/source/ui/remotecontrol/Receiver.cxx | 6 -
sd/source/ui/slideshow/slideshowimpl.cxx | 6 -
sd/source/ui/slideshow/slideshowviewimpl.cxx | 2
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 4
sd/source/ui/table/TableDesignPane.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 10 -
sd/source/ui/view/drviews3.cxx | 2
sd/source/ui/view/drviews4.cxx | 2
sd/source/ui/view/drviewse.cxx | 4
sd/source/ui/view/drviewsf.cxx | 4
sdext/source/minimizer/graphiccollector.cxx | 8 -
sdext/source/minimizer/impoptimizer.cxx | 10 -
sdext/source/minimizer/optimizationstats.cxx | 2
sdext/source/minimizer/optimizerdialog.cxx | 2
sdext/source/minimizer/optimizerdialogcontrols.cxx | 8 -
sdext/source/minimizer/pagecollector.cxx | 8 -
sdext/source/minimizer/unodialog.cxx | 6 -
sdext/source/presenter/PresenterHelpView.cxx | 2
sdext/source/presenter/PresenterNotesView.cxx | 2
sdext/source/presenter/PresenterPane.cxx | 2
sdext/source/presenter/PresenterPaneFactory.cxx | 4
sdext/source/presenter/PresenterSlideShowView.cxx | 4
sdext/source/presenter/PresenterSlideSorter.cxx | 4
sdext/source/presenter/PresenterSpritePane.cxx | 2
sdext/source/presenter/PresenterToolBar.cxx | 2
sfx2/source/doc/DocumentMetadataAccess.cxx | 2
sfx2/source/doc/SfxDocumentMetaData.cxx | 4
sfx2/source/doc/docinf.cxx | 2
sfx2/source/doc/doctemplates.cxx | 2
sfx2/source/doc/objmisc.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 2
sfx2/source/sidebar/SidebarController.cxx | 2
sfx2/source/view/viewsh.cxx | 4
slideshow/source/engine/shapes/viewappletshape.cxx | 4
slideshow/source/engine/slideshowimpl.cxx | 2
slideshow/source/inc/tools.hxx | 2
svl/source/fsstor/fsstorage.cxx | 4
svl/source/misc/sharecontrolfile.cxx | 4
svtools/source/dialogs/ServerDetailsControls.cxx | 2
svtools/source/hatchwindow/ipwin.cxx | 32 +++--
svtools/source/hatchwindow/ipwin.hxx | 5
svtools/source/uno/popupmenucontrollerbase.cxx | 2
svtools/source/uno/svtxgridcontrol.cxx | 4
svtools/source/uno/toolboxcontroller.cxx | 2
svtools/source/uno/unogridcolumnfacade.cxx | 2
svx/source/form/fmshimp.cxx | 2
svx/source/form/fmvwimp.cxx | 4
svx/source/form/formcontroller.cxx | 2
svx/source/table/cellcursor.cxx | 4
svx/source/table/svdotable.cxx | 6 -
svx/source/table/tablecontroller.cxx | 2
svx/source/table/tablelayouter.cxx | 6 -
svx/source/table/tablertfimporter.cxx | 4
svx/source/tbxctrls/tbcontrl.cxx | 2
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 4
svx/source/unogallery/unogaltheme.cxx | 2
svx/source/xml/xmlxtimp.cxx | 4
sw/qa/api/SwXDocumentSettings.cxx | 2
sw/qa/extras/accessibility/accessible_relation_set.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 2
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2
sw/source/core/unocore/unotbl.cxx | 2
sw/source/filter/docx/swdocxreader.cxx | 4
sw/source/filter/rtf/swparrtf.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 2
sw/source/filter/ww8/ww8toolbar.cxx | 4
sw/source/filter/xml/xmlimp.cxx | 2
sw/source/ui/vba/vbaaddins.cxx | 2
sw/source/ui/vba/vbaautotextentry.cxx | 4
sw/source/ui/vba/vbabookmark.cxx | 4
sw/source/ui/vba/vbadocument.cxx | 6 -
sw/source/ui/vba/vbafield.cxx | 4
sw/source/ui/vba/vbapagesetup.cxx | 4
sw/source/ui/vba/vbarange.cxx | 4
sw/source/ui/vba/vbasections.cxx | 4
sw/source/ui/vba/vbatable.cxx | 6 -
sw/source/ui/vba/vbatables.cxx | 4
sw/source/ui/vba/vbatablesofcontents.cxx | 2
sw/source/ui/vba/vbaview.cxx | 6 -
sw/source/ui/vba/wordvbahelper.cxx | 6 -
sw/source/uibase/sidebar/PageMarginControl.cxx | 2
sw/source/uibase/sidebar/PageOrientationControl.cxx | 2
test/source/drawing/xdrawpages.cxx | 4
test/source/helper/form.cxx | 2
test/source/sheet/shape.cxx | 6 -
test/source/sheet/sheetcell.cxx | 8 -
test/source/sheet/sheetcellrange.cxx | 8 -
test/source/sheet/sheetcellranges.cxx | 8 -
test/source/sheet/xactivationbroadcaster.cxx | 2
test/source/sheet/xcellformatrangessupplier.cxx | 2
test/source/sheet/xcellseries.cxx | 28 ++--
test/source/sheet/xconsolidatable.cxx | 4
test/source/sheet/xdatapilotdescriptor.cxx | 12 +-
test/source/sheet/xdatapilotfield.cxx | 2
test/source/sheet/xdatapilottable2.cxx | 2
test/source/sheet/xdatapilottables.cxx | 2
test/source/sheet/xdatapilottablessupplier.cxx | 2
test/source/sheet/xdocumentauditing.cxx | 4
test/source/sheet/xheaderfootercontent.cxx | 6 -
test/source/sheet/xmultipleoperation.cxx | 2
test/source/sheet/xscenariossupplier.cxx | 2
test/source/sheet/xsheetannotationanchor.cxx | 2
test/source/sheet/xsheetannotations.cxx | 6 -
test/source/sheet/xsheetannotationssupplier.cxx | 2
test/source/sheet/xspreadsheet.cxx | 4
test/source/sheet/xspreadsheets2.cxx | 2
test/source/sheet/xusedareacursor.cxx | 4
test/source/style/xstyleloader.cxx | 8 -
test/source/table/xcellrange.cxx | 6 -
test/source/text/xsimpletext.cxx | 2
test/source/text/xtextcontent.cxx | 4
test/source/text/xtextrange.cxx | 6 -
test/source/view/xcontrolaccess.cxx | 4
toolkit/qa/cppunit/Dialog.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 4
toolkit/source/controls/grid/gridcontrol.cxx | 2
unoxml/source/rdf/librdf_repository.cxx | 2
vbahelper/source/msforms/vbacontrol.cxx | 10 -
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 24 ++--
vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 4
vbahelper/source/vbahelper/vbacommandbars.cxx | 2
vbahelper/source/vbahelper/vbadocumentbase.cxx | 2
vbahelper/source/vbahelper/vbashaperange.cxx | 2
vbahelper/source/vbahelper/vbashapes.cxx | 8 -
vcl/qa/api/XGraphicTest.cxx | 6 -
vcl/source/control/tabctrl.cxx | 6 -
vcl/source/filter/wmf/emfwr.cxx | 6 -
vcl/source/outdev/map.cxx | 12 +-
vcl/source/window/dialog.cxx | 6 -
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 12 +-
writerfilter/source/filter/RtfFilter.cxx | 2
writerfilter/source/filter/WriterFilter.cxx | 2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
writerperfect/qa/unit/WPXSvStreamTest.cxx | 4
writerperfect/qa/unit/WpftLoader.cxx | 2
writerperfect/source/common/WPXSvInputStream.cxx | 2
xmloff/source/chart/SchXMLTools.cxx | 4
xmloff/source/draw/animationexport.cxx | 14 +-
xmloff/source/draw/animationimport.cxx | 6 -
xmloff/source/draw/sdxmlexp.cxx | 4
xmloff/source/draw/shapeexport.cxx | 8 -
xmloff/source/draw/ximpshap.cxx | 2
xmloff/source/style/XMLFontAutoStylePool.cxx | 2
xmloff/source/style/XMLFontStylesContext.cxx | 4
xmloff/source/table/XMLTableExport.cxx | 2
xmloff/source/text/txtparai.cxx | 2
xmlsecurity/source/helper/documentsignaturemanager.cxx | 2
358 files changed, 859 insertions(+), 832 deletions(-)
New commits:
commit 630db80d17616d635cf2e5f1d5a0852428b794a3
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun May 12 12:28:24 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon May 13 08:15:43 2019 +0200
handle empty tools::Rectangle in vcl
Change-Id: I64b5c3c5a19408febe7753db6ea403b91f7f5c83
Reviewed-on: https://gerrit.libreoffice.org/72188
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index ea9cfcee05f1..d5b9eeeeacfa 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -544,11 +544,13 @@ tools::Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos, long nWidth, l
nLastPos = 0;
tools::Rectangle aRect = ImplGetTabRect( nLastPos, nWidth, nHeight );
+ if (aRect.IsEmpty())
+ return aRect;
long nW = nWidth-TAB_OFFSET*2;
long nH = nHeight-aRect.Bottom()-TAB_OFFSET*2;
aRect = (nW > 0 && nH > 0)
- ? tools::Rectangle( Point( TAB_OFFSET, aRect.Bottom()+TAB_OFFSET ), Size( nW, nH ) )
- : tools::Rectangle();
+ ? tools::Rectangle( Point( TAB_OFFSET, aRect.Bottom()+TAB_OFFSET ), Size( nW, nH ) )
+ : tools::Rectangle();
return aRect;
}
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index c3200c53020d..17d23f787aa9 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -607,11 +607,13 @@ void EMFWriter::ImplWriteSize( const Size& rSize)
void EMFWriter::ImplWriteRect( const tools::Rectangle& rRect )
{
const tools::Rectangle aRect( OutputDevice::LogicToLogic ( rRect, maVDev->GetMapMode(), maDestMapMode ));
+ auto right = aRect.IsWidthEmpty() ? aRect.Left() : aRect.Right();
+ auto bottom = aRect.IsHeightEmpty() ? aRect.Top() : aRect.Bottom();
m_rStm
.WriteInt32( aRect.Left() )
.WriteInt32( aRect.Top() )
- .WriteInt32( aRect.Right() )
- .WriteInt32( aRect.Bottom() );
+ .WriteInt32( right )
+ .WriteInt32( bottom );
}
void EMFWriter::ImplWritePolygonRecord( const tools::Polygon& rPoly, bool bClose )
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 60da88618fba..5a91bfb274c3 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1863,10 +1863,14 @@ tools::Rectangle OutputDevice::LogicToLogic( const tools::Rectangle& rRectSource
{
ENTER3( eUnitSource, eUnitDest );
- return tools::Rectangle( fn3( rRectSource.Left(), nNumerator, nDenominator ),
- fn3( rRectSource.Top(), nNumerator, nDenominator ),
- fn3( rRectSource.Right(), nNumerator, nDenominator ),
- fn3( rRectSource.Bottom(), nNumerator, nDenominator ) );
+ auto left = fn3( rRectSource.Left(), nNumerator, nDenominator );
+ auto top = fn3( rRectSource.Top(), nNumerator, nDenominator );
+ if (rRectSource.IsEmpty())
+ return tools::Rectangle( left, top );
+
+ auto right = fn3( rRectSource.Right(), nNumerator, nDenominator );
+ auto bottom = fn3( rRectSource.Bottom(), nNumerator, nDenominator );
+ return tools::Rectangle(left, top, right, bottom);
}
else
{
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 51a83dd7705b..0de96d2be4ca 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -731,15 +731,19 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
{
tools::Rectangle aBtn1Rect = NWGetScrollButtonRect(ControlPart::ButtonLeft, aTrackRect);
tools::Rectangle aBtn2Rect = NWGetScrollButtonRect(ControlPart::ButtonRight, aTrackRect);
- aTrackRect.SetLeft( aBtn1Rect.Right() );
- aTrackRect.SetRight( aBtn2Rect.Left() );
+ if (!aBtn1Rect.IsWidthEmpty())
+ aTrackRect.SetLeft( aBtn1Rect.Right() );
+ if (!aBtn2Rect.IsWidthEmpty())
+ aTrackRect.SetRight( aBtn2Rect.Left() );
}
else
{
tools::Rectangle aBtn1Rect = NWGetScrollButtonRect(ControlPart::ButtonUp, aTrackRect);
tools::Rectangle aBtn2Rect = NWGetScrollButtonRect(ControlPart::ButtonDown, aTrackRect);
- aTrackRect.SetTop( aBtn1Rect.Bottom() + 1 );
- aTrackRect.SetBottom( aBtn2Rect.Top() );
+ if (!aBtn1Rect.IsHeightEmpty())
+ aTrackRect.SetTop( aBtn1Rect.Bottom() + 1 );
+ if (!aBtn2Rect.IsHeightEmpty())
+ aTrackRect.SetBottom( aBtn2Rect.Top() );
}
GtkStyleContext* pScrollbarTroughStyle = scrollbarOrientation == GTK_ORIENTATION_VERTICAL ?
commit 71eea07e1f888aea325aff2c07cd8fc6e8db4a8a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Sun May 12 12:26:54 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon May 13 08:15:32 2019 +0200
handle empty tools::Rectangle in svtoools
Change-Id: Ia6c4d56e8019fd92ac69499b9902f8bd8ca27fec
Reviewed-on: https://gerrit.libreoffice.org/72187
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index adb751941456..f5235535a33b 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -45,8 +45,10 @@ SvResizeHelper::SvResizeHelper()
|*
|* Description: the eight handles to magnify
*************************************************************************/
-void SvResizeHelper::FillHandleRectsPixel( tools::Rectangle aRects[ 8 ] ) const
+std::array<tools::Rectangle,8> SvResizeHelper::FillHandleRectsPixel() const
{
+ std::array<tools::Rectangle,8> aRects;
+
// only because of EMPTY_RECT
Point aBottomRight = aOuter.BottomRight();
@@ -80,6 +82,7 @@ void SvResizeHelper::FillHandleRectsPixel( tools::Rectangle aRects[ 8 ] ) const
aRects[ 7 ] = tools::Rectangle( Point( aOuter.Left(),
aOuter.Center().Y() - aBorder.Height() / 2 ),
aBorder );
+ return aRects;
}
/*************************************************************************
@@ -87,20 +90,26 @@ void SvResizeHelper::FillHandleRectsPixel( tools::Rectangle aRects[ 8 ] ) const
|*
|* Description: the four edges are calculated
*************************************************************************/
-void SvResizeHelper::FillMoveRectsPixel( tools::Rectangle aRects[ 4 ] ) const
+std::array<tools::Rectangle,4> SvResizeHelper::FillMoveRectsPixel() const
{
+ std::array<tools::Rectangle,4> aRects;
+
// upper
aRects[ 0 ] = aOuter;
aRects[ 0 ].SetBottom( aRects[ 0 ].Top() + aBorder.Height() -1 );
// right
aRects[ 1 ] = aOuter;
- aRects[ 1 ].SetLeft( aRects[ 1 ].Right() - aBorder.Width() -1 );
+ if (!aOuter.IsWidthEmpty())
+ aRects[ 1 ].SetLeft( aRects[ 1 ].Right() - aBorder.Width() -1 );
// lower
aRects[ 2 ] = aOuter;
- aRects[ 2 ].SetTop( aRects[ 2 ].Bottom() - aBorder.Height() -1 );
+ if (!aOuter.IsHeightEmpty())
+ aRects[ 2 ].SetTop( aRects[ 2 ].Bottom() - aBorder.Height() -1 );
// left
aRects[ 3 ] = aOuter;
aRects[ 3 ].SetRight( aRects[ 3 ].Left() + aBorder.Width() -1 );
+
+ return aRects;
}
/*************************************************************************
@@ -116,15 +125,13 @@ void SvResizeHelper::Draw(vcl::RenderContext& rRenderContext)
rRenderContext.SetFillColor( COL_LIGHTGRAY );
rRenderContext.SetLineColor();
- tools::Rectangle aMoveRects[ 4 ];
- FillMoveRectsPixel( aMoveRects );
+ std::array<tools::Rectangle,4> aMoveRects = FillMoveRectsPixel();
sal_uInt16 i;
for (i = 0; i < 4; i++)
rRenderContext.DrawRect(aMoveRects[i]);
// draw handles
rRenderContext.SetFillColor(Color()); // black
- tools::Rectangle aRects[ 8 ];
- FillHandleRectsPixel(aRects);
+ std::array<tools::Rectangle,8> aRects = FillHandleRectsPixel();
for (i = 0; i < 8; i++)
rRenderContext.DrawRect( aRects[ i ] );
rRenderContext.Pop();
@@ -137,8 +144,7 @@ void SvResizeHelper::Draw(vcl::RenderContext& rRenderContext)
*************************************************************************/
void SvResizeHelper::InvalidateBorder( vcl::Window * pWin )
{
- tools::Rectangle aMoveRects[ 4 ];
- FillMoveRectsPixel( aMoveRects );
+ std::array<tools::Rectangle,4> aMoveRects = FillMoveRectsPixel();
for(const auto & rMoveRect : aMoveRects)
pWin->Invalidate( rMoveRect );
}
@@ -172,14 +178,12 @@ short SvResizeHelper::SelectMove( vcl::Window * pWin, const Point & rPos )
{
if( -1 == nGrab )
{
- tools::Rectangle aRects[ 8 ];
- FillHandleRectsPixel( aRects );
+ std::array<tools::Rectangle,8> aRects = FillHandleRectsPixel();
for( sal_uInt16 i = 0; i < 8; i++ )
if( aRects[ i ].IsInside( rPos ) )
return i;
// Move-Rect overlaps Handles
- tools::Rectangle aMoveRects[ 4 ];
- FillMoveRectsPixel( aMoveRects );
+ std::array<tools::Rectangle,4> aMoveRects = FillMoveRectsPixel();
for(const auto & rMoveRect : aMoveRects)
if( rMoveRect.IsInside( rPos ) )
return 8;
diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx
index 47c033cdc255..cacf743278dc 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.hxx
@@ -22,6 +22,7 @@
#include <tools/gen.hxx>
#include <vcl/window.hxx>
+#include <array>
/********************** SvResizeHelper ***********************************
*************************************************************************/
@@ -48,8 +49,8 @@ public:
}
// Clockwise, start at upper left
- void FillHandleRectsPixel( tools::Rectangle aRects[ 8 ] ) const;
- void FillMoveRectsPixel( tools::Rectangle aRects[ 4 ] ) const;
+ std::array<tools::Rectangle,8> FillHandleRectsPixel() const;
+ std::array<tools::Rectangle,4> FillMoveRectsPixel() const;
void Draw(vcl::RenderContext& rRenderContext);
void InvalidateBorder( vcl::Window * );
bool SelectBegin( vcl::Window *, const Point & rPos );
commit a361231b1363d072d737e9b1d411b71aa9550d84
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri May 10 10:13:12 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon May 13 08:15:27 2019 +0200
fix wrong SET/QUERY flags passed to uno::Reference
By creating deleted methods for the wrong calls.
Avoids the compiler needing to construct a temporary
Change-Id: I3b8c648d6bb22d22827bf74f21ea5a2a17fc0f6a
Reviewed-on: https://gerrit.libreoffice.org/72103
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 9a1a33ea5473..4c0289c1970e 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -424,7 +424,7 @@ bool EmbedMedia(uno::Reference<frame::XModel> const& xModel,
uno::Reference<document::XStorageBasedDocument> const xSBD(xModel,
uno::UNO_QUERY_THROW);
uno::Reference<embed::XStorage> const xStorage(
- xSBD->getDocumentStorage(), uno::UNO_QUERY_THROW);
+ xSBD->getDocumentStorage(), uno::UNO_SET_THROW);
OUString const media("Media");
uno::Reference<embed::XStorage> const xSubStorage(
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index b004f7b52403..0b580399eb15 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -196,7 +196,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL&
try
{
m_bError = false;
- m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete, aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString()) ), css::uno::UNO_QUERY_THROW );
+ m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete, aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(), OUString()) ), css::uno::UNO_SET_THROW );
// OK- we can start async playing ...
// Count this request and initialize self-holder against dying by uno ref count ...
m_xSelfHold.set(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY);
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 2cf0a44dcaf5..5e2c32eed5ca 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -482,11 +482,11 @@ namespace basctl
Reference< XNameContainer > xLibrary;
try
{
- Reference< XLibraryContainer > xLibContainer( getLibraryContainer( _eType ), UNO_QUERY_THROW );
+ Reference< XLibraryContainer > xLibContainer( getLibraryContainer( _eType ), UNO_SET_THROW );
if ( xLibContainer->hasByName( _rLibName ) )
xLibrary.set( xLibContainer->getByName( _rLibName ), UNO_QUERY_THROW );
else
- xLibrary.set( xLibContainer->createLibrary( _rLibName ), UNO_QUERY_THROW );
+ xLibrary.set( xLibContainer->createLibrary( _rLibName ), UNO_SET_THROW );
if ( !xLibContainer->isLibraryLoaded( _rLibName ) )
xLibContainer->loadLibrary( _rLibName );
@@ -569,7 +569,7 @@ namespace basctl
_out_rModuleOrDialog.clear();
try
{
- Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, true ), UNO_QUERY_THROW );
+ Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, true ), UNO_SET_THROW );
if ( xLib->hasByName( _rObjectName ) )
{
_out_rModuleOrDialog = xLib->getByName( _rObjectName );
@@ -593,7 +593,7 @@ namespace basctl
try
{
- Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, true ), UNO_QUERY_THROW );
+ Reference< XNameContainer > xLib( getLibrary( _eType, _rLibName, true ), UNO_SET_THROW );
// get element
Any aElement( xLib->getByName( _rOldName ) );
@@ -622,7 +622,7 @@ namespace basctl
Reference< XInputStreamProvider > xISP( aElement, UNO_QUERY_THROW );
if ( !_rxExistingDialogModel.is() )
{
- Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
+ Reference< XInputStream > xInput( xISP->createInputStream(), UNO_SET_THROW );
::xmlscript::importDialogModel( xInput, xDialogModel, aContext, isDocument() ? getDocument() : Reference< XModel >() );
}
@@ -696,7 +696,7 @@ namespace basctl
{
try
{
- Reference< XNameContainer > xLib( getOrCreateLibrary( _eType, _rLibName ), UNO_QUERY_THROW );
+ Reference< XNameContainer > xLib( getOrCreateLibrary( _eType, _rLibName ), UNO_SET_THROW );
if ( xLib->hasByName( _rObjectName ) )
return false;
@@ -715,7 +715,7 @@ namespace basctl
{
try
{
- Reference< XNameContainer > xLib( getOrCreateLibrary( E_SCRIPTS, _rLibName ), UNO_QUERY_THROW );
+ Reference< XNameContainer > xLib( getOrCreateLibrary( E_SCRIPTS, _rLibName ), UNO_SET_THROW );
if ( !xLib->hasByName( _rModName ) )
return false;
xLib->replaceByName( _rModName, Any( _rModuleCode ) );
@@ -733,7 +733,7 @@ namespace basctl
{
try
{
- Reference< XNameContainer > xLib( getLibrary( E_DIALOGS, _rLibName, true ), UNO_QUERY_THROW );
+ Reference< XNameContainer > xLib( getLibrary( E_DIALOGS, _rLibName, true ), UNO_SET_THROW );
// create dialog
_out_rDialogProvider.clear();
@@ -927,7 +927,7 @@ namespace basctl
Reference< XUriReferenceFactory > xUriFac = UriReferenceFactory::create(xContext);
OUString aLinkURL( xLibContainer->getLibraryLinkURL( _rLibName ) );
- Reference< XUriReference > xUriRef( xUriFac->parse( aLinkURL ), UNO_QUERY_THROW );
+ Reference< XUriReference > xUriRef( xUriFac->parse( aLinkURL ), UNO_SET_THROW );
OUString aScheme = xUriRef->getScheme();
if ( aScheme.equalsIgnoreAsciiCase("file") )
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index ae4eacb5e821..87983eeaf821 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -133,7 +133,7 @@ void PropBrw::ImplReCreateController()
::cppu::createComponentContext( aHandlerContextInfo, SAL_N_ELEMENTS( aHandlerContextInfo ), xOwnContext ) );
// create a property browser controller
- Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_QUERY_THROW );
+ Reference< XMultiComponentFactory > xFactory( xInspectorContext->getServiceManager(), UNO_SET_THROW );
static const char s_sControllerServiceName[] = "com.sun.star.awt.PropertyBrowserController";
m_xBrowserController.set( xFactory->createInstanceWithContext( s_sControllerServiceName, xInspectorContext ), UNO_QUERY );
if ( !m_xBrowserController.is() )
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index 32e0041f77e3..ec8f57026f3b 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -42,7 +42,7 @@ namespace {
*/
uno::Reference< frame::XModuleManager2 > lclCreateModuleManager()
{
- uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext(), uno::UNO_QUERY_THROW );
+ uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext(), uno::UNO_SET_THROW );
return frame::ModuleManager::create(xContext);
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index d98b7364bdcd..080d35a6027d 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1823,7 +1823,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
}
}
- xTargetLibrariesStor.set( i_rStorage->openStorageElement( sTargetLibrariesStoreName, embed::ElementModes::READWRITE ), UNO_QUERY_THROW );
+ xTargetLibrariesStor.set( i_rStorage->openStorageElement( sTargetLibrariesStoreName, embed::ElementModes::READWRITE ), UNO_SET_THROW );
}
catch( const uno::Exception& )
{
@@ -2654,7 +2654,7 @@ void SfxLibraryContainer::initializeFromDocument( const Reference< XStorageBased
Reference< XServiceInfo > xSI( _rxDocument, UNO_QUERY_THROW );
if ( xSI->supportsService("com.sun.star.document.OfficeDocument"))
{
- xDocStorage.set( _rxDocument->getDocumentStorage(), UNO_QUERY_THROW );
+ xDocStorage.set( _rxDocument->getDocumentStorage(), UNO_SET_THROW );
}
Reference< XModel > xDocument( _rxDocument, UNO_QUERY_THROW );
Reference< XComponent > xDocComponent( _rxDocument, UNO_QUERY_THROW );
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 55e2cfcdf13a..543f9170266c 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -1100,7 +1100,7 @@ namespace canvas
try
{
uno::Reference< rendering::XGraphicDevice > xDevice( i_rxCanvas->getDevice(),
- uno::UNO_QUERY_THROW );
+ uno::UNO_SET_THROW );
uno::Reference< lang::XServiceInfo > xServiceInfo( xDevice,
uno::UNO_QUERY_THROW );
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index bfb9f400ab28..9f21829bca5f 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -542,9 +542,9 @@ void TestWindow::Paint(vcl::RenderContext&, const tools::Rectangle&)
try
{
uno::Reference< rendering::XCanvas > xVDevCanvas( GetCanvas(),
- uno::UNO_QUERY_THROW );
+ uno::UNO_SET_THROW );
uno::Reference< rendering::XGraphicDevice > xVDevDevice( xVDevCanvas->getDevice(),
- uno::UNO_QUERY_THROW );
+ uno::UNO_SET_THROW );
DemoRenderer aVDevRenderer( xVDevDevice, xVDevCanvas, GetSizePixel());
xVDevCanvas->clear();
aVDevRenderer.drawGrid();
@@ -559,7 +559,7 @@ void TestWindow::Paint(vcl::RenderContext&, const tools::Rectangle&)
uno::Reference< rendering::XCanvas > xCanvas( GetSpriteCanvas(),
uno::UNO_QUERY_THROW );
uno::Reference< rendering::XGraphicDevice > xDevice( xCanvas->getDevice(),
- uno::UNO_QUERY_THROW );
+ uno::UNO_SET_THROW );
DemoRenderer aRenderer( xDevice, xCanvas, GetSizePixel() );
xCanvas->clear();
diff --git a/chart2/qa/extras/PivotChartTest.cxx b/chart2/qa/extras/PivotChartTest.cxx
index d5d348c89df5..549444511a45 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -63,7 +63,7 @@ void lclModifyOrientation(uno::Reference<sheet::XDataPilotDescriptor> const & xD
OUString const & sFieldName,
sheet::DataPilotFieldOrientation eOrientation)
{
- uno::Reference<container::XIndexAccess> xIndexAccess(xDescriptor->getDataPilotFields(), UNO_QUERY_THROW);
+ uno::Reference<container::XIndexAccess> xIndexAccess(xDescriptor->getDataPilotFields(), UNO_SET_THROW);
sal_Int32 nCount = xIndexAccess->getCount();
for (sal_Int32 i = 0; i < nCount; ++i)
{
@@ -79,7 +79,7 @@ void lclModifyFunction(uno::Reference<sheet::XDataPilotDescriptor> const & xDesc
OUString const & sFieldName,
sheet::GeneralFunction eFunction)
{
- uno::Reference<container::XIndexAccess> xPilotIndexAccess(xDescriptor->getDataPilotFields(), UNO_QUERY_THROW);
+ uno::Reference<container::XIndexAccess> xPilotIndexAccess(xDescriptor->getDataPilotFields(), UNO_SET_THROW);
sal_Int32 nCount = xPilotIndexAccess->getCount();
for (sal_Int32 i = 0; i < nCount; ++i)
{
@@ -95,7 +95,7 @@ void lclModifyLayoutInfo(uno::Reference<sheet::XDataPilotDescriptor> const & xDe
OUString const & sFieldName,
sheet::DataPilotFieldLayoutInfo aLayoutInfo)
{
- uno::Reference<container::XIndexAccess> xIndexAccess(xDescriptor->getDataPilotFields(), UNO_QUERY_THROW);
+ uno::Reference<container::XIndexAccess> xIndexAccess(xDescriptor->getDataPilotFields(), UNO_SET_THROW);
sal_Int32 nCount = xIndexAccess->getCount();
for (sal_Int32 i = 0; i < nCount; ++i)
{
@@ -115,7 +115,7 @@ void lclModifySubtotals(uno::Reference<sheet::XDataPilotDescriptor> const & xDes
OUString const & sFieldName,
uno::Sequence<sheet::GeneralFunction> const & rSubtotalFunctions)
{
- uno::Reference<container::XIndexAccess> xIndexAccess(xDescriptor->getDataPilotFields(), UNO_QUERY_THROW);
+ uno::Reference<container::XIndexAccess> xIndexAccess(xDescriptor->getDataPilotFields(), UNO_SET_THROW);
sal_Int32 nCount = xIndexAccess->getCount();
for (sal_Int32 i = 0; i < nCount; ++i)
{
@@ -193,7 +193,7 @@ uno::Sequence<uno::Reference<chart2::data::XLabeledDataSequence>>
uno::Sequence<beans::PropertyValue> aArguments( comphelper::InitPropertySequence(
{{"CellRangeRepresentation", uno::Any(OUString("PT at categories"))}} ));
- uno::Reference<chart2::data::XDataProvider> xDataProvider(xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW);
+ uno::Reference<chart2::data::XDataProvider> xDataProvider(xChartDoc->getDataProvider(), uno::UNO_SET_THROW);
return xDataProvider->createDataSource(aArguments)->getDataSequences();
}
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 5341c5eab929..db2d05a11b5c 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -406,7 +406,7 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false)
{
setTestFileName(aTestFile);
load(getTestFileDirName(), getTestFileName());
- uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW);
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY);
@@ -572,7 +572,7 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false)
{
setTestFileName(sTestFile);
load(getTestFileDirName(), getTestFileName());
- uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW);
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY);
@@ -643,7 +643,7 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false)
{
setTestFileName(sTestFile);
load(getTestFileDirName(), getTestFileName());
- uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW);
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY);
@@ -796,7 +796,7 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false)
{
setTestFileName(sTestFile);
load(getTestFileDirName(), getTestFileName());
- uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW);
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage();
uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY);
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index a5c42530a0b6..2dafbaac8017 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -1871,7 +1871,7 @@ void Chart2ExportTest::testCustomDataLabel()
uno::Sequence<uno::Reference<chart2::XDataPointCustomLabelField>> aFields;
// 1
- xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), aFields.getLength());
@@ -1887,7 +1887,7 @@ void Chart2ExportTest::testCustomDataLabel()
CPPUNIT_ASSERT_EQUAL(OUString("{0C576297-5A9F-4B4E-A675-B6BA406B7D87}"), aFields[1]->getGuid());
// 2
- xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(8), aFields.getLength());
@@ -1929,7 +1929,7 @@ void Chart2ExportTest::testCustomDataLabel()
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nCharUnderline);
// 3
- xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aFields.getLength());
@@ -1938,7 +1938,7 @@ void Chart2ExportTest::testCustomDataLabel()
CPPUNIT_ASSERT_EQUAL(OUString("{C8F3EB90-8960-4F9A-A3AD-B4FAC4FE4566}"), aFields[0]->getGuid());
// 4
- xPropertySet.set(xDataSeries->getDataPointByIndex(3), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(3), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), aFields.getLength());
@@ -1966,7 +1966,7 @@ void Chart2ExportTest::testCustomDataLabelMultipleSeries()
uno::Sequence<uno::Reference<chart2::XDataPointCustomLabelField>> aFields;
// First series
- xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aFields.getLength());
@@ -1987,7 +1987,7 @@ void Chart2ExportTest::testCustomDataLabelMultipleSeries()
xDataSeries = getDataSeriesFromDoc(xChartDoc, 0, 1);
CPPUNIT_ASSERT(xDataSeries.is());
- xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aFields.getLength());
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 475b5bbe2209..4510ac447487 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -580,28 +580,28 @@ void Chart2ImportTest::testPPTXPercentageNumberFormats()
const sal_Int32 nPercentFormatSimple = getNumberFormat(xChartDoc, "0%");
const sal_Int32 nPercentFormatDecimal = getNumberFormat(xChartDoc, "0.00%");
- xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("Label") >>= aLabel;
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber);
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent);
xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat;
CPPUNIT_ASSERT_EQUAL(nPercentFormatSimple, nNumberFormat);
- xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("Label") >>= aLabel;
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber);
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent);
xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat;
CPPUNIT_ASSERT_EQUAL(nPercentFormatDecimal, nNumberFormat);
- xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("Label") >>= aLabel;
CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumber);
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent);
xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat;
CPPUNIT_ASSERT_EQUAL(nPercentFormatSimple, nNumberFormat);
- xPropertySet.set(xDataSeries->getDataPointByIndex(3), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(3), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("Label") >>= aLabel;
CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumber);
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent);
@@ -748,7 +748,7 @@ void Chart2ImportTest::testBnc882383()
uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
- uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
OUString sGradientName;
xPropertySet->getPropertyValue("GradientName") >>= sGradientName;
CPPUNIT_ASSERT(!sGradientName.isEmpty());
@@ -991,7 +991,7 @@ void Chart2ImportTest::testChartHatchFillXLSX()
uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
- uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(1), uno::UNO_QUERY_THROW);
+ uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW);
OUString sHatchName;
xPropertySet->getPropertyValue("HatchName") >>= sHatchName;
CPPUNIT_ASSERT(!sHatchName.isEmpty());
@@ -1077,7 +1077,7 @@ void Chart2ImportTest::testNumberFormatsXLSX()
const sal_Int32 nChartDataNumberFormat = getNumberFormat(
xChartDoc, "_(\"$\"* #,##0_);_(\"$\"* \\(#,##0\\);_(\"$\"* \"-\"??_);_(@_)");
- xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("Label") >>= aLabel;
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber);
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent);
@@ -1088,7 +1088,7 @@ void Chart2ImportTest::testNumberFormatsXLSX()
bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource;
CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess && bLinkNumberFormatToSource);
- xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("Label") >>= aLabel;
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber);
CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumberInPercent);
@@ -1099,7 +1099,7 @@ void Chart2ImportTest::testNumberFormatsXLSX()
bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource;
CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess && bLinkNumberFormatToSource);
- xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("Label") >>= aLabel;
CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumber);
CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent);
@@ -1213,7 +1213,7 @@ void Chart2ImportTest::testTrendlineDefaultValue2007XLSX()
Reference<chart2::XRegressionCurve> xCurve = xRegressionCurveSequence[0];
- Reference<beans::XPropertySet> xPropSet(xCurve->getEquationProperties(), uno::UNO_QUERY_THROW);
+ Reference<beans::XPropertySet> xPropSet(xCurve->getEquationProperties(), uno::UNO_SET_THROW);
uno::Any aAny = xPropSet->getPropertyValue("ShowEquation");
bool bShowEquation = true;
CPPUNIT_ASSERT(aAny >>= bShowEquation);
@@ -1239,7 +1239,7 @@ void Chart2ImportTest::testTrendlineDefaultValue2013XLSX()
Reference<chart2::XRegressionCurve> xCurve = xRegressionCurveSequence[0];
- Reference<beans::XPropertySet> xPropSet(xCurve->getEquationProperties(), uno::UNO_QUERY_THROW);
+ Reference<beans::XPropertySet> xPropSet(xCurve->getEquationProperties(), uno::UNO_SET_THROW);
uno::Any aAny = xPropSet->getPropertyValue("ShowEquation");
bool bShowEquation = false;
CPPUNIT_ASSERT(aAny >>= bShowEquation);
@@ -1476,7 +1476,7 @@ void Chart2ImportTest::testTdf90510()
{
load("/chart2/qa/extras/data/xls/", "piechart_outside.xls");
uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
- Reference<beans::XPropertySet> xPropSet( xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_QUERY_THROW );
+ Reference<beans::XPropertySet> xPropSet( xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_SET_THROW );
uno::Any aAny = xPropSet->getPropertyValue( "LabelPlacement" );
CPPUNIT_ASSERT( aAny.hasValue() );
sal_Int32 nLabelPlacement = 0;
@@ -1488,7 +1488,7 @@ void Chart2ImportTest::testTdf109858()
{
load("/chart2/qa/extras/data/xlsx/", "piechart_outside.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
- Reference<beans::XPropertySet> xPropSet( xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_QUERY_THROW );
+ Reference<beans::XPropertySet> xPropSet( xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_SET_THROW );
uno::Any aAny = xPropSet->getPropertyValue( "LabelPlacement" );
CPPUNIT_ASSERT( aAny.hasValue() );
sal_Int32 nLabelPlacement = 0;
@@ -1508,9 +1508,9 @@ void Chart2ImportTest::testTdf122226()
uno::Reference< chart2::XChartDocument > xChartDoc ( getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT( xChartDoc.is() );
- css::uno::Reference<chart2::XDiagram> xDiagram(xChartDoc->getFirstDiagram(), UNO_QUERY_THROW);
+ css::uno::Reference<chart2::XDiagram> xDiagram(xChartDoc->getFirstDiagram(), UNO_SET_THROW);
Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0);
- uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
CPPUNIT_ASSERT(xPropertySet.is());
uno::Any aAny = xPropertySet->getPropertyValue( "LabelSeparator" );
@@ -1536,7 +1536,7 @@ void Chart2ImportTest::testTdf115107()
uno::Sequence<uno::Reference<chart2::XDataPointCustomLabelField>> aFields;
// 1
- xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), aFields.getLength());
@@ -1551,7 +1551,7 @@ void Chart2ImportTest::testTdf115107()
CPPUNIT_ASSERT_EQUAL(OUString("90"), aFields[1]->getString());
// 2
- xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(8), aFields.getLength());
@@ -1592,7 +1592,7 @@ void Chart2ImportTest::testTdf115107()
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nCharUnderline);
// 3
- xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aFields.getLength());
@@ -1600,7 +1600,7 @@ void Chart2ImportTest::testTdf115107()
CPPUNIT_ASSERT_EQUAL(OUString("DATA"), aFields[0]->getString());
// 4
- xPropertySet.set(xDataSeries->getDataPointByIndex(3), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(3), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), aFields.getLength());
@@ -1626,7 +1626,7 @@ void Chart2ImportTest::testTdf115107_2()
uno::Sequence<uno::Reference<chart2::XDataPointCustomLabelField>> aFields;
// First series
- xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aFields.getLength());
@@ -1647,7 +1647,7 @@ void Chart2ImportTest::testTdf115107_2()
xDataSeries = getDataSeriesFromDoc(xChartDoc, 0, 1);
CPPUNIT_ASSERT(xDataSeries.is());
- xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aFields.getLength());
@@ -1763,7 +1763,7 @@ namespace {
void checkDataLabelProperties(const Reference<chart2::XDataSeries>& xDataSeries, sal_Int32 nDataPointIndex, bool bValueVisible)
{
- uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(nDataPointIndex), uno::UNO_QUERY_THROW);
+ uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(nDataPointIndex), uno::UNO_SET_THROW);
chart2::DataPointLabel aLabel;
xPropertySet->getPropertyValue("Label") >>= aLabel;
CPPUNIT_ASSERT_EQUAL(bValueVisible, static_cast<bool>(aLabel.ShowNumber));
@@ -1793,10 +1793,10 @@ void Chart2ImportTest::testDataPointInheritedColorDOCX()
load( "/chart2/qa/extras/data/docx/", "data_point_inherited_color.docx" );
uno::Reference< chart2::XChartDocument > xChartDoc ( getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT( xChartDoc.is() );
- css::uno::Reference<chart2::XDiagram> xDiagram(xChartDoc->getFirstDiagram(), UNO_QUERY_THROW);
+ css::uno::Reference<chart2::XDiagram> xDiagram(xChartDoc->getFirstDiagram(), UNO_SET_THROW);
Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0);
- uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW);
+ uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
CPPUNIT_ASSERT(xPropertySet.is());
sal_Int32 nColor = xPropertySet->getPropertyValue("FillColor").get<sal_Int32>();
CPPUNIT_ASSERT_EQUAL(sal_Int32(16776960), nColor);
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 2141ff8a828d..db9a4ed63465 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -195,7 +195,7 @@ Reference< lang::XComponent > getChartCompFromSheet( sal_Int32 nSheet, uno::Refe
uno::Reference< document::XEmbeddedObjectSupplier > xEmbObjectSupplier(xChart, UNO_QUERY_THROW);
- uno::Reference< lang::XComponent > xChartComp( xEmbObjectSupplier->getEmbeddedObject(), UNO_QUERY_THROW );
+ uno::Reference< lang::XComponent > xChartComp( xEmbObjectSupplier->getEmbeddedObject(), UNO_SET_THROW );
return xChartComp;
@@ -230,7 +230,7 @@ Reference<lang::XComponent> getPivotChartCompFromSheet(sal_Int32 nSheet, uno::Re
uno::Reference<document::XEmbeddedObjectSupplier> xEmbObjectSupplier(xTablePivotChart, UNO_QUERY_THROW);
- uno::Reference<lang::XComponent> xChartComp(xEmbObjectSupplier->getEmbeddedObject(), UNO_QUERY_THROW);
+ uno::Reference<lang::XComponent> xChartComp(xEmbObjectSupplier->getEmbeddedObject(), UNO_SET_THROW);
return xChartComp;
}
@@ -248,7 +248,7 @@ Reference<chart2::XChartDocument> getPivotChartDocFromSheet(uno::Reference<table
uno::Reference<document::XEmbeddedObjectSupplier> xEmbObjectSupplier(xTablePivotChart, UNO_QUERY_THROW);
- uno::Reference<lang::XComponent> xChartComp(xEmbObjectSupplier->getEmbeddedObject(), UNO_QUERY_THROW);
+ uno::Reference<lang::XComponent> xChartComp(xEmbObjectSupplier->getEmbeddedObject(), UNO_SET_THROW);
uno::Reference<chart2::XChartDocument> xChartDoc(xChartComp, UNO_QUERY_THROW);
return xChartDoc;
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 682b0ca96783..f36d6c7bf9a6 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -561,7 +561,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{
try
{
- Reference< chart2::XRegressionCurveCalculator > xCalculator( xCurve->getCalculator(), uno::UNO_QUERY_THROW );
+ Reference< chart2::XRegressionCurveCalculator > xCalculator( xCurve->getCalculator(), uno::UNO_SET_THROW );
sal_Int32 aDegree = 2;
sal_Int32 aPeriod = 2;
bool bForceIntercept = false;
@@ -664,7 +664,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
{
try
{
- Reference< chart2::XRegressionCurveCalculator > xCalculator( xCurve->getCalculator(), uno::UNO_QUERY_THROW );
+ Reference< chart2::XRegressionCurveCalculator > xCalculator( xCurve->getCalculator(), uno::UNO_SET_THROW );
RegressionCurveHelper::initializeCurveCalculator( xCalculator, xSeries, xChartModel );
const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper();
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index b3ddd8cb4635..d26d2be9da39 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -639,7 +639,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
}
uno::Reference< document::XUndoManagerSupplier > xSuppUndo( getModel(), uno::UNO_QUERY_THROW );
- m_xUndoManager.set( xSuppUndo->getUndoManager(), uno::UNO_QUERY_THROW );
+ m_xUndoManager.set( xSuppUndo->getUndoManager(), uno::UNO_SET_THROW );
return true;
}
@@ -1429,7 +1429,7 @@ void ChartController::NotifyUndoActionHdl( std::unique_ptr<SdrUndoAction> pUndoA
try
{
const Reference< document::XUndoManagerSupplier > xSuppUndo( getModel(), uno::UNO_QUERY_THROW );
- const Reference< document::XUndoManager > xUndoManager( xSuppUndo->getUndoManager(), uno::UNO_QUERY_THROW );
+ const Reference< document::XUndoManager > xUndoManager( xSuppUndo->getUndoManager(), uno::UNO_SET_THROW );
const Reference< document::XUndoAction > xAction( new impl::ShapeUndoElement( std::move(pUndoAction) ) );
xUndoManager->addUndoAction( xAction );
}
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 401cd70895f0..677ab8fb77ad 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -44,7 +44,7 @@ UndoCommandDispatch::UndoCommandDispatch(
m_xModel( xModel )
{
uno::Reference< document::XUndoManagerSupplier > xSuppUndo( m_xModel, uno::UNO_QUERY_THROW );
- m_xUndoManager.set( xSuppUndo->getUndoManager(), uno::UNO_QUERY_THROW );
+ m_xUndoManager.set( xSuppUndo->getUndoManager(), uno::UNO_SET_THROW );
}
UndoCommandDispatch::~UndoCommandDispatch()
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index f24864e57949..e4917d002df7 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -457,7 +457,7 @@ ErrCode XMLFilter::impl_ImportStream(
uno::UNO_QUERY_THROW );
Reference< document::XImporter > xImporter( xDocHandler, uno::UNO_QUERY_THROW );
- xImporter->setTargetDocument( Reference< lang::XComponent >( m_xTargetDoc, uno::UNO_QUERY_THROW ));
+ xImporter->setTargetDocument( Reference< lang::XComponent >( m_xTargetDoc, uno::UNO_SET_THROW ));
if ( !m_sDocumentHandler.isEmpty() )
{
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index 7cfe95ed028e..f3570114551e 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -182,7 +182,7 @@ OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation(
// create and prepare a number formatter
if( !xNumFmtSupplier.is())
return getRepresentation();
- Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext(), uno::UNO_QUERY_THROW );
+ Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext(), uno::UNO_SET_THROW );
Reference< util::XNumberFormatter > xNumFormatter( util::NumberFormatter::create(xContext), uno::UNO_QUERY_THROW );
xNumFormatter->attachNumberFormatsSupplier( xNumFmtSupplier );
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index a2c77c026a72..0f3c3b73a0b9 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -475,7 +475,7 @@ Assembly ^ TypeEmitter::type_resolve(
if (nullptr == ret_type)
{
Reference< reflection::XConstantTypeDescription > xConstant(
- xType, UNO_QUERY_THROW );
+ xType, UNO_SET_THROW );
::System::Object ^ constant =
to_cli_constant( xConstant->getConstantValue() );
Emit::TypeBuilder ^ type_builder =
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 3e0faadbfb8b..6115ad0e2e25 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -101,7 +101,7 @@ namespace comphelper {
if ( xDPS.is() )
{
Reference< XDocumentProperties > xDocProps (
- xDPS->getDocumentProperties(), UNO_QUERY_THROW );
+ xDPS->getDocumentProperties(), css::uno::UNO_SET_THROW );
sTitle = xDocProps->getTitle();
if ( !sTitle.isEmpty() )
return sTitle;
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index c585e2ba0577..f7180bdd230a 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -682,7 +682,7 @@ uno::Reference< io::XStream > OStorageHelper::GetStreamAtPath(
sal_uInt32 nStorageMode = nOpenMode & ~embed::ElementModes::TRUNCATE;
uno::Reference< embed::XStorage > xStorage(
LookupStorageAtPath( xParentStorage, aElems, nStorageMode, rNastiness ),
- uno::UNO_QUERY_THROW );
+ uno::UNO_SET_THROW );
return xStorage->openStreamElement( aName, nOpenMode );
}
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index bba4cd65bc33..ca91c1401749 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -810,9 +810,9 @@ void collectColumnInformation(const Reference< XConnection>& _xConnection,
::utl::SharedUNOComponent< XStatement > xStmt( _xConnection->createStatement() );
Reference< XPropertySet > xStatementProps( xStmt, UNO_QUERY_THROW );
xStatementProps->setPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_ESCAPEPROCESSING ), makeAny( false ) );
- Reference< XResultSet > xResult( xStmt->executeQuery( sSelect ), UNO_QUERY_THROW );
+ Reference< XResultSet > xResult( xStmt->executeQuery( sSelect ), UNO_SET_THROW );
Reference< XResultSetMetaDataSupplier > xSuppMeta( xResult, UNO_QUERY_THROW );
- Reference< XResultSetMetaData > xMeta( xSuppMeta->getMetaData(), UNO_QUERY_THROW );
+ Reference< XResultSetMetaData > xMeta( xSuppMeta->getMetaData(), UNO_SET_THROW );
sal_Int32 nCount = xMeta->getColumnCount();
OSL_ENSURE( nCount != 0, "::dbtools::collectColumnInformation: result set has empty (column-less) meta data!" );
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index be9a133d6923..0bc5c91abd4d 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -149,7 +149,7 @@ namespace dbtools
}
// get the format key of our bound field
- Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_QUERY_THROW );
+ Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_SET_THROW );
bool bHaveFieldFormat = false;
const OUString sFormatKeyProperty( "FormatKey" );
if ( xPSI->hasPropertyByName( sFormatKeyProperty ) )
@@ -166,7 +166,7 @@ namespace dbtools
// some more formatter settings
_rData.m_nKeyType = ::comphelper::getNumberFormatType( xNumberFormatsSupp->getNumberFormats(), _rData.m_nFormatKey );
- Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_QUERY_THROW );
+ Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_SET_THROW );
OSL_VERIFY( xFormatSettings->getPropertyValue("NullDate") >>= _rData.m_aNullDate );
// remember the formatter
@@ -190,7 +190,7 @@ namespace dbtools
try
{
// get the number formats supplier of the connection of the form
- Reference< XConnection > xConnection( getConnection( i_rRowSet ), UNO_QUERY_THROW );
+ Reference< XConnection > xConnection( getConnection( i_rRowSet ), UNO_SET_THROW );
Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( xConnection, true, i_rContext ), UNO_SET_THROW );
// create a number formatter for it
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 790ecb03899f..54b381b72bb7 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -266,7 +266,7 @@ namespace param
:ParameterWrapperContainer_Base( m_aMutex )
{
Reference< XParametersSupplier > xSuppParams( _rxComposer, UNO_QUERY_THROW );
- Reference< XIndexAccess > xParameters( xSuppParams->getParameters(), UNO_QUERY_THROW );
+ Reference< XIndexAccess > xParameters( xSuppParams->getParameters(), css::uno::UNO_SET_THROW );
sal_Int32 nParamCount( xParameters->getCount() );
m_aParameters.reserve( nParamCount );
for ( sal_Int32 i=0; i<nParamCount; ++i )
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index e3346e031775..a21c8cf1a41d 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -138,7 +138,7 @@ namespace dbtools
{
// ask the connection for the query
Reference< XQueriesSupplier > xSupplyQueries( _rData.xConnection, UNO_QUERY_THROW );
- Reference< XNameAccess > xQueries( xSupplyQueries->getQueries(), UNO_QUERY_THROW );
+ Reference< XNameAccess > xQueries( xSupplyQueries->getQueries(), css::uno::UNO_SET_THROW );
if ( !xQueries->hasByName( _rData.sCommand ) )
break;
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 9a63991320d8..22fcdaa466e2 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -143,7 +143,7 @@ namespace connectivity { namespace hsqldb
{
if ( !m_bReadOnly )
{
- Reference< XStatement > xStmt( m_xConnection->createStatement(), UNO_QUERY_THROW );
+ Reference< XStatement > xStmt( m_xConnection->createStatement(), css::uno::UNO_SET_THROW );
xStmt->execute( "CHECKPOINT DEFRAG" );
}
}
@@ -223,8 +223,8 @@ namespace connectivity { namespace hsqldb
{
Reference< XConnection > xMe( *this, UNO_QUERY );
Reference< XDataDefinitionSupplier > xDefinitionsSupp( m_xDriver, UNO_QUERY_THROW );
- Reference< XTablesSupplier > xTablesSupp( xDefinitionsSupp->getDataDefinitionByConnection( xMe ), UNO_QUERY_THROW );
- xTables.set( xTablesSupp->getTables(), UNO_QUERY_THROW );
+ Reference< XTablesSupplier > xTablesSupp( xDefinitionsSupp->getDataDefinitionByConnection( xMe ), css::uno::UNO_SET_THROW );
+ xTables.set( xTablesSupp->getTables(), css::uno::UNO_SET_THROW );
}
catch( const RuntimeException& ) { throw; }
catch( const Exception& )
@@ -246,7 +246,7 @@ namespace connectivity { namespace hsqldb
bool bDoesExist = false;
try
{
- Reference< XNameAccess > xTables( impl_getTableContainer_throw(), UNO_QUERY_THROW );
+ Reference< XNameAccess > xTables( impl_getTableContainer_throw(), css::uno::UNO_SET_THROW );
bDoesExist = xTables->hasByName( _rTableName );
}
catch( const Exception& )
@@ -276,7 +276,7 @@ namespace connectivity { namespace hsqldb
Reference< XConnection > xMe( *this, UNO_QUERY_THROW );
// split the fully qualified name
- Reference< XDatabaseMetaData > xMetaData( xMe->getMetaData(), UNO_QUERY_THROW );
+ Reference< XDatabaseMetaData > xMetaData( xMe->getMetaData(), css::uno::UNO_SET_THROW );
OUString sCatalog, sSchema, sName;
::dbtools::qualifiedNameComponents( xMetaData, _rTableName, sCatalog, sSchema, sName, ::dbtools::EComposeRule::Complete );
@@ -286,8 +286,8 @@ namespace connectivity { namespace hsqldb
HTools::appendTableFilterCrit( sSQL, sCatalog, sSchema, sName, true );
sSQL.append( " AND TABLE_TYPE = 'TABLE'" );
- Reference< XStatement > xStatement( xMe->createStatement(), UNO_QUERY_THROW );
- Reference< XResultSet > xTableHsqlType( xStatement->executeQuery( sSQL.makeStringAndClear() ), UNO_QUERY_THROW );
+ Reference< XStatement > xStatement( xMe->createStatement(), css::uno::UNO_SET_THROW );
+ Reference< XResultSet > xTableHsqlType( xStatement->executeQuery( sSQL.makeStringAndClear() ), css::uno::UNO_SET_THROW );
if ( xTableHsqlType->next() ) // might not succeed in case of VIEWs
{
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index ac89a718bbf1..810acdf08561 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -157,7 +157,7 @@ namespace connectivity { namespace hsqldb
aCommand.append( "SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.SYSTEM_VIEWS " );
HTools::appendTableFilterCrit( aCommand, m_CatalogName, m_SchemaName, m_Name, false );
::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW );
- Reference< XResultSet > xResult( xStatement->executeQuery( aCommand.makeStringAndClear() ), UNO_QUERY_THROW );
+ Reference< XResultSet > xResult( xStatement->executeQuery( aCommand.makeStringAndClear() ), css::uno::UNO_SET_THROW );
if ( !xResult->next() )
{
// hmm. There is no view the name as we know it. Can only mean some other instance
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
index 8b8e4c96e810..d7a82dd95034 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
@@ -84,7 +84,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column )
OUString sColumnName;
try
{
- Reference< XPropertySet > xColumnProps( (m_xColumns->get())[column-1], UNO_QUERY_THROW );
+ Reference< XPropertySet > xColumnProps( (m_xColumns->get())[column-1], UNO_SET_THROW );
OSL_VERIFY( xColumnProps->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) >>= sColumnName );
}
catch( const Exception& )
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index cca610102430..d6e2cedd4e8e 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -394,7 +394,7 @@ namespace cppcanvas
rOrigTextLayout->getFont()->createTextLayout( aContext,
rOrigTextLayout->getMainTextDirection(),
0 ),
- uno::UNO_QUERY_THROW );
+ uno::UNO_SET_THROW );
return xTextLayout;
}
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 8392ace881d0..3dbfdfa843d6 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -153,7 +153,7 @@ static void createInstance(
throw RuntimeException( "cannot get service instance \"" + rServiceName + "\"!" );
}
- rxOut.set( x, UNO_QUERY_THROW );
+ rxOut.set( x.get(), UNO_QUERY_THROW );
}
/// @throws Exception
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index d5b38b0f8625..78351cdd187c 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1334,7 +1334,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, void
if (xCfgMgr.is())
{
// open the configuration and update our UI
- uno::Reference<ui::XAcceleratorConfiguration> xTempAccMgr(xCfgMgr->getShortCutManager(), uno::UNO_QUERY_THROW);
+ uno::Reference<ui::XAcceleratorConfiguration> xTempAccMgr(xCfgMgr->getShortCutManager(), uno::UNO_SET_THROW);
m_xEntriesBox->freeze();
ResetConfig();
@@ -1395,7 +1395,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void
uno::Reference<embed::XStorage> xUIConfig(
xRootStorage->openStorageElement(FOLDERNAME_UICONFIG, embed::ElementModes::WRITE),
- uno::UNO_QUERY_THROW);
+ uno::UNO_SET_THROW);
uno::Reference<beans::XPropertySet> xUIConfigProps(
xUIConfig,
uno::UNO_QUERY_THROW);
@@ -1413,7 +1413,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void
// which are set currently at the UI!
// Don't copy the m_xAct content to it... because m_xAct will be updated
// from the UI on pressing the button "OK" only. And inbetween it's not up to date!
- uno::Reference<ui::XAcceleratorConfiguration> xTargetAccMgr(xCfgMgr->getShortCutManager(), uno::UNO_QUERY_THROW);
+ uno::Reference<ui::XAcceleratorConfiguration> xTargetAccMgr(xCfgMgr->getShortCutManager(), uno::UNO_SET_THROW);
Apply(xTargetAccMgr);
// commit (order is important!)
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 05c6e1fdacb6..4ae83691ae40 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1028,7 +1028,7 @@ void SvxConfigPage::Reset( const SfxItemSet* )
uno::Reference < css::ui::XUIConfigurationManager > xDocCfgMgr;
uno::Reference< uno::XComponentContext > xContext(
- ::comphelper::getProcessComponentContext(), uno::UNO_QUERY_THROW );
+ ::comphelper::getProcessComponentContext(), uno::UNO_SET_THROW );
m_xFrame = GetFrame();
OUString aModuleId = GetFrameWithDefaultAndIdentify( m_xFrame );
diff --git a/cui/source/dialogs/SignatureLineDialog.cxx b/cui/source/dialogs/SignatureLineDialog.cxx
index b5f7e846512c..16f3b22ddd4a 100644
--- a/cui/source/dialogs/SignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignatureLineDialog.cxx
@@ -199,9 +199,9 @@ void SignatureLineDialog::Apply()
xShape->setPosition(aCellPosition);
Reference<XSpreadsheetView> xView(m_xModel->getCurrentController(), UNO_QUERY_THROW);
- Reference<XSpreadsheet> xSheet(xView->getActiveSheet(), UNO_QUERY_THROW);
+ Reference<XSpreadsheet> xSheet(xView->getActiveSheet(), UNO_SET_THROW);
Reference<XDrawPageSupplier> xDrawPageSupplier(xSheet, UNO_QUERY_THROW);
- Reference<XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_QUERY_THROW);
+ Reference<XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW);
Reference<XShapes> xShapes(xDrawPage, UNO_QUERY_THROW);
xShapes->add(xShape);
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index d34b27a9b806..11ef3a8820e2 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -616,7 +616,7 @@ IMPL_LINK(SvxScriptOrgDialog, ButtonHdl, weld::Button&, rButton, void)
try
{
Reference< provider::XScript > xScript(
- mspNode->getScript( scriptURL ), UNO_QUERY_THROW );
+ mspNode->getScript( scriptURL ), UNO_SET_THROW );
const Sequence< Any > args(0);
Sequence< sal_Int16 > outIndex;
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index c55392c4db98..7ad1ddabfb72 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -57,7 +57,7 @@ namespace dbaccess
OUString sColumName;
for (auto const& column : _rColumns->get())
{
- Reference< XPropertySet > xColumn(column, UNO_QUERY_THROW);
+ Reference< XPropertySet > xColumn(column, UNO_SET_THROW);
xColumn->getPropertyValue( PROPERTY_NAME ) >>= sColumName;
aNames.push_back( sColumName );
}
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 3c9b62b5d0ab..80771e48b76f 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1250,7 +1250,7 @@ bool OKeySet::fetchRow()
ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >((*m_pKeyColumnNames).size() + m_pForeignColumnNames->size());
::comphelper::disposeComponent(m_xSet);
- m_xRow.set(m_xDriverRow, UNO_QUERY_THROW);
+ m_xRow.set(m_xDriverRow, UNO_SET_THROW);
connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = aKeyRow->get().begin();
// copy key columns
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 397e9246f8fe..890260121dde 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1718,7 +1718,7 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
bool bHaveAnyColumnSetting = false;
try
{
- Reference< XPropertySetInfo > xInfo( _rxTemplateColumn->getPropertySetInfo(), UNO_QUERY_THROW );
+ Reference< XPropertySetInfo > xInfo( _rxTemplateColumn->getPropertySetInfo(), UNO_SET_THROW );
// a number of properties is plain copied
const OUString aPropertyNames[] = {
@@ -1759,7 +1759,7 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
// can use as new template column
try
{
- Reference< XPropertySetInfo > xInfo( _rxTemplateColumn->getPropertySetInfo(), UNO_QUERY_THROW );
+ Reference< XPropertySetInfo > xInfo( _rxTemplateColumn->getPropertySetInfo(), UNO_SET_THROW );
if ( !xInfo->hasPropertyByName( PROPERTY_TABLENAME ) )
// no chance
return;
@@ -1767,13 +1767,13 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
OUString sTableName;
OSL_VERIFY( _rxTemplateColumn->getPropertyValue( PROPERTY_TABLENAME ) >>= sTableName );
- Reference< XNameAccess > xTables( impl_getTables_throw(), UNO_QUERY_THROW );
+ Reference< XNameAccess > xTables( impl_getTables_throw(), UNO_SET_THROW );
if ( !xTables->hasByName( sTableName ) )
// no chance
return;
Reference< XColumnsSupplier > xTableColSup( xTables->getByName( sTableName ), UNO_QUERY_THROW );
- Reference< XNameAccess > xTableCols( xTableColSup->getColumns(), UNO_QUERY_THROW );
+ Reference< XNameAccess > xTableCols( xTableColSup->getColumns(), UNO_SET_THROW );
OUString sTableColumnName;
@@ -1903,7 +1903,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
else
{
// create the rowset columns
- Reference< XResultSetMetaData > xMeta( getMetaData(), UNO_QUERY_THROW );
+ Reference< XResultSetMetaData > xMeta( getMetaData(), UNO_SET_THROW );
sal_Int32 nCount = xMeta->getColumnCount();
m_aDataColumns.reserve(nCount+1);
aColumns->get().reserve(nCount+1);
@@ -2224,7 +2224,7 @@ Reference< XNameAccess > ORowSet::impl_getTables_throw()
Reference< XTablesSupplier > xTablesAccess( m_xActiveConnection, UNO_QUERY );
if ( xTablesAccess.is() )
{
- xTables.set( xTablesAccess->getTables(), UNO_QUERY_THROW );
+ xTables.set( xTablesAccess->getTables(), UNO_SET_THROW );
}
else if ( m_xTables )
{
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index a2b8c1a99658..c5cd28e606e4 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -785,7 +785,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( )
{
xPreparedStatement.set( m_xConnection->prepareStatement( sSQL ), UNO_QUERY_THROW );
xResMetaDataSup.set( xPreparedStatement, UNO_QUERY_THROW );
- xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW );
+ xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_SET_THROW );
}
catch( const Exception& ) { }
@@ -801,19 +801,19 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( )
for(sal_Int32 i = 1;i <= xPara->getCount();++i)
xParameters->setNull(i,DataType::VARCHAR);
xResMetaDataSup.set(xPreparedStatement->executeQuery(), UNO_QUERY_THROW );
- xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW );
+ xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_SET_THROW );
}
catch( const Exception& ) { }
}
if ( !xResultSetMeta.is() )
{
- xStatement.reset( Reference< XStatement >( m_xConnection->createStatement(), UNO_QUERY_THROW ) );
+ xStatement.reset( Reference< XStatement >( m_xConnection->createStatement(), UNO_SET_THROW ) );
Reference< XPropertySet > xStatementProps( xStatement, UNO_QUERY_THROW );
try { xStatementProps->setPropertyValue( PROPERTY_ESCAPE_PROCESSING, makeAny( false ) ); }
catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION("dbaccess"); }
xResMetaDataSup.set( xStatement->executeQuery( sSQL ), UNO_QUERY_THROW );
- xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW );
+ xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_SET_THROW );
if (xResultSetMeta.is())
{
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index cce34d3227db..af31bcfde41b 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -241,12 +241,12 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const
// retrieve the table in question
Reference< XTablesSupplier > xSuppTables( _rxConnection, UNO_QUERY_THROW );
- Reference< XNameAccess > xTables( xSuppTables->getTables(), UNO_QUERY_THROW );
+ Reference< XNameAccess > xTables( xSuppTables->getTables(), UNO_SET_THROW );
if ( !xTables->hasByName( sComposedTableName ) )
return nullptr;
Reference< XColumnsSupplier > xSuppCols( xTables->getByName( sComposedTableName ), UNO_QUERY_THROW );
- Reference< XNameAccess > xColumns( xSuppCols->getColumns(), UNO_QUERY_THROW );
+ Reference< XNameAccess > xColumns( xSuppCols->getColumns(), UNO_SET_THROW );
OUString sColumn;
OSL_VERIFY( getPropertyValue( PROPERTY_REALNAME ) >>= sColumn );
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index c690ca756a3b..f9137575a78d 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -142,7 +142,7 @@ void OQuery::rebuildColumns()
{
xComposer->setQuery( m_sCommand );
Reference< XColumnsSupplier > xCols( xComposer, UNO_QUERY_THROW );
- xColumns.set( xCols->getColumns(), UNO_QUERY_THROW );
+ xColumns.set( xCols->getColumns(), UNO_SET_THROW );
xColumnsIndexed.set( xColumns, UNO_QUERY_THROW );
}
catch( const SQLException& ) { }
@@ -159,7 +159,7 @@ void OQuery::rebuildColumns()
::dbtools::throwSQLException( sError, StandardSQLState::GENERAL_ERROR, *this );
}
- Reference< XDatabaseMetaData > xDBMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW );
+ Reference< XDatabaseMetaData > xDBMeta( m_xConnection->getMetaData(), UNO_SET_THROW );
::rtl::Reference< OSQLColumns > aParseColumns(
::connectivity::parse::OParseColumn::createColumnsForResultSet( xResultSetMeta, xDBMeta,xColumnDefinitions ) );
xColumns = OPrivateColumns::createWithIntrinsicNames(
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 3787dc8cf6aa..034c19dd7f5e 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1071,7 +1071,7 @@ Reference< XStorageBasedLibraryContainer > ODatabaseModelImpl::getLibraryContain
rxContainer.set(
(*Factory)( m_aContext, xDocument ),
- UNO_QUERY_THROW
+ UNO_SET_THROW
);
}
catch( const RuntimeException& )
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index b84ddfdf2fd9..24db02fc6be0 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1066,7 +1066,7 @@ void ODatabaseDocument::impl_storeAs_throw( const OUString& _rURL, const ::comph
}
// store to current storage
- Reference< XStorage > xCurrentStorage( m_pImpl->getOrCreateRootStorage(), UNO_QUERY_THROW );
+ Reference< XStorage > xCurrentStorage( m_pImpl->getOrCreateRootStorage(), UNO_SET_THROW );
Sequence< PropertyValue > aMediaDescriptor( lcl_appendFileNameToDescriptor( _rArguments, _rURL ) );
impl_storeToStorage_throw( xCurrentStorage, aMediaDescriptor, _rGuard );
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index dc8a786f75cd..c3b6214e7bc8 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -911,7 +911,7 @@ namespace
try
{
// obtain all properties currently known at the bag
- Reference< XPropertySetInfo > xPSI( _rxPropertyBag->getPropertySetInfo(), UNO_QUERY_THROW );
+ Reference< XPropertySetInfo > xPSI( _rxPropertyBag->getPropertySetInfo(), UNO_SET_THROW );
Sequence< Property > aAllExistentProperties( xPSI->getProperties() );
Reference< XPropertyState > xPropertyState( _rxPropertyBag, UNO_QUERY_THROW );
@@ -1017,7 +1017,7 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con
{
// collect the property attributes of all current settings
Reference< XPropertySet > xSettingsAsProps( m_pImpl->m_xSettings, UNO_QUERY_THROW );
- Reference< XPropertySetInfo > xPST( xSettingsAsProps->getPropertySetInfo(), UNO_QUERY_THROW );
+ Reference< XPropertySetInfo > xPST( xSettingsAsProps->getPropertySetInfo(), UNO_SET_THROW );
Sequence< Property > aSettings( xPST->getProperties() );
std::map< OUString, sal_Int32 > aPropertyAttributes;
for ( auto const & setting : aSettings )
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index d367b058af44..abe4570fd719 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -563,7 +563,7 @@ namespace
void ODocumentDefinition::impl_removeFrameFromDesktop_throw( const Reference<XComponentContext> & _rxContext, const Reference< XFrame >& _rxFrame )
{
Reference< XDesktop2 > xDesktop = Desktop::create( _rxContext );
- Reference< XFrames > xFrames( xDesktop->getFrames(), UNO_QUERY_THROW );
+ Reference< XFrames > xFrames( xDesktop->getFrames(), UNO_SET_THROW );
xFrames->remove( _rxFrame );
}
@@ -696,7 +696,7 @@ void ODocumentDefinition::impl_initFormEditView( const Reference< XController >&
try
{
Reference< XViewSettingsSupplier > xSettingsSupplier( _rxController, UNO_QUERY_THROW );
- Reference< XPropertySet > xViewSettings( xSettingsSupplier->getViewSettings(), UNO_QUERY_THROW );
+ Reference< XPropertySet > xViewSettings( xSettingsSupplier->getViewSettings(), UNO_SET_THROW );
// the below code could indirectly tamper with the "modified" flag of the model, temporarily disable this
LockModifiable aLockModify( _rxController->getModel() );
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index 0881fd3a01a0..e899f1a16935 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -209,7 +209,7 @@ void OContainerMediator::notifyElementCreated( const OUString& _sName, const Ref
impl_initSettings_nothrow( _sName, _xDest );
// collect the to-be-monitored properties
- Reference< XPropertySetInfo > xPSI( _xDest->getPropertySetInfo(), UNO_QUERY_THROW );
+ Reference< XPropertySetInfo > xPSI( _xDest->getPropertySetInfo(), UNO_SET_THROW );
Sequence< Property > aProperties( xPSI->getProperties() );
for ( auto const & property : aProperties )
{
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index 930dfca632f8..f1a51b1e3fa2 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -66,7 +66,7 @@ namespace dbaccess
throw DisposedException();
Reference< XConnectionTools > xConnectionTools( xConnection, UNO_QUERY_THROW );
- Reference< XObjectNames > xObjectNames( xConnectionTools->getObjectNames(), UNO_QUERY_THROW );
+ Reference< XObjectNames > xObjectNames( xConnectionTools->getObjectNames(), css::uno::UNO_SET_THROW );
xObjectNames->checkNameForCreate( m_pImpl->nCommandType, _rName );
}
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 55ef8b4e5466..be0e50586da9 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -298,7 +298,7 @@ namespace dbaccess
// the storage for all components of the current type
Reference< XStorage > xComponentsStor( xRecoveryStorage->openStorageElement(
- SubComponentRecovery::getComponentsStorageName( eComponentType ), ElementModes::READ ), UNO_QUERY_THROW );
+ SubComponentRecovery::getComponentsStorageName( eComponentType ), ElementModes::READ ), UNO_SET_THROW );
// loop through all components of this type
for (auto const& elem : elemMapCompDescs.second)
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index 75ceb4042ac5..2831f406bbf7 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -42,7 +42,7 @@ namespace dbaccess
ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" );
const Reference< XStream > xStream(
- i_rParentStorage->openStreamElement( i_rStreamName, ElementModes::READWRITE ), UNO_QUERY_THROW );
+ i_rParentStorage->openStreamElement( i_rStreamName, ElementModes::READWRITE ), UNO_SET_THROW );
m_xOutputStream.set( xStream->getOutputStream(), UNO_SET_THROW );
}
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index 7e6d9477830d..c04eff6f8912 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -125,7 +125,7 @@ namespace dbaccess
ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" );
const Reference< css::io::XStream > xStream(
- i_rParentStorage->openStreamElement( i_rStreamName, css::embed::ElementModes::READ ), UNO_QUERY_THROW );
+ i_rParentStorage->openStreamElement( i_rStreamName, css::embed::ElementModes::READ ), css::uno::UNO_SET_THROW );
m_xInputStream.set( xStream->getInputStream(), css::uno::UNO_SET_THROW );
m_xParser.set( Parser::create(i_rContext) );
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 19b6e426fd31..e4ccd72fd7c4 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -370,13 +370,13 @@ namespace dbaccess
// open the sub storage for the given kind of components
const OUString& rStorageName( getComponentsStorageName( m_eType ) );
const Reference< XStorage > xComponentsStorage( i_rRecoveryStorage->openStorageElement(
- rStorageName, ElementModes::READWRITE ), UNO_QUERY_THROW );
+ rStorageName, ElementModes::READWRITE ), UNO_SET_THROW );
// find a free sub storage name, and create Yet Another Sub Storage
const OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) );
const OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName );
const Reference< XStorage > xObjectStor( xComponentsStorage->openStorageElement(
- sStorName, ElementModes::READWRITE ), UNO_QUERY_THROW );
+ sStorName, ElementModes::READWRITE ), UNO_SET_THROW );
switch ( m_eType )
{
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 7ff4d349e935..7a662e9b6b74 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -350,7 +350,7 @@ namespace dbmm
try
{
Reference< XStorageBasedDocument > xStorageDoc( _rxDocument, UNO_QUERY_THROW );
- Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_QUERY_THROW );
+ Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_SET_THROW );
bSuccess = lcl_commitStorage_nothrow( xDocStorage );
}
catch( const Exception& )
@@ -614,7 +614,7 @@ namespace dbmm
try
{
Reference< XStorageBasedDocument > xStorageDoc( _rxDocument, UNO_QUERY_THROW );
- Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_QUERY_THROW );
+ Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_SET_THROW );
// the "Scripts" storage exist, or if it does not (yet) exist and we are in write mode
// => open the storage
@@ -692,7 +692,7 @@ namespace dbmm
try
{
Reference< XStorageBasedDocument > xStorageDoc( _rxDocument, UNO_QUERY_THROW );
- Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_QUERY_THROW );
+ Reference< XStorage > xDocStorage( xStorageDoc->getDocumentStorage(), UNO_SET_THROW );
xDocStorage->removeElement( sScriptsStorageName );
}
catch( const Exception& )
@@ -1356,7 +1356,7 @@ namespace dbmm
Reference< XStorageBasedLibraryContainer > xSourceLibraries(
_eScriptType == eBasic ? xSubDocScripts->getBasicLibraries() : xSubDocScripts->getDialogLibraries(),
- UNO_QUERY_THROW
+ UNO_SET_THROW
);
Reference< XLibraryContainerPassword > xSourcePasswords( xSourceLibraries, UNO_QUERY );
OSL_ENSURE( xSourcePasswords.is(),
@@ -1377,12 +1377,12 @@ namespace dbmm
if ( _eScriptType == eBasic )
{
xTargetLibraries.set( DocumentScriptLibraryContainer::create(
- m_aContext, xStorageDoc ), UNO_QUERY_THROW );
+ m_aContext, xStorageDoc ), UNO_SET_THROW );
}
else
{
xTargetLibraries.set( DocumentDialogLibraryContainer::create(
- m_aContext, xStorageDoc ), UNO_QUERY_THROW );
+ m_aContext, xStorageDoc ), UNO_SET_THROW );
}
// copy all libs to the target, with potentially renaming them
@@ -1429,7 +1429,7 @@ namespace dbmm
// copy the content of this particular library
Reference< XNameAccess > xSourceLib( xSourceLibraries->getByName( *pSourceLibName ), UNO_QUERY_THROW );
- Reference< XNameContainer > xTargetLib( xTargetLibraries->createLibrary( sNewLibName ), UNO_QUERY_THROW );
+ Reference< XNameContainer > xTargetLib( xTargetLibraries->createLibrary( sNewLibName ), UNO_SET_THROW );
Sequence< OUString > aLibElementNames( xSourceLib->getElementNames() );
for ( auto const & sourceElementName : aLibElementNames )
@@ -1679,7 +1679,7 @@ namespace dbmm
{
// load a dialog model from the stream describing it
Reference< XInputStreamProvider > xISP( _inout_rDialogLibraryElement, UNO_QUERY_THROW );
- Reference< XInputStream > xInput( xISP->createInputStream(), UNO_QUERY_THROW );
+ Reference< XInputStream > xInput( xISP->createInputStream(), UNO_SET_THROW );
Reference< XNameContainer > xDialogModel( m_aContext->getServiceManager()->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", m_aContext), UNO_QUERY_THROW );
::xmlscript::importDialogModel( xInput, xDialogModel, m_aContext, m_xDocumentModel );
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 8f5560c9dc4d..3d0b0d0c1f16 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -488,7 +488,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
try
{
Reference< XModel2 > xModel2( xModel, UNO_QUERY_THROW );
- Reference< XController2 > xController( xModel2->createViewController( sViewName, Sequence< PropertyValue >(), rFrame ), UNO_QUERY_THROW );
+ Reference< XController2 > xController( xModel2->createViewController( sViewName, Sequence< PropertyValue >(), rFrame ), UNO_SET_THROW );
xController->attachModel( xModel );
xModel->connectController( xController.get() );
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index a674fce529d6..9dbb729f7d47 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -346,7 +346,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
pMedium = new SfxMedium(sFileName, (StreamMode::READ | StreamMode::NOCREATE));
try
{
- xStorage.set(pMedium->GetStorage(false), UNO_QUERY_THROW);
+ xStorage.set(pMedium->GetStorage(false), UNO_SET_THROW);
if (!sStreamRelPath.isEmpty())
xStorage = xStorage->openStorageElement(sStreamRelPath, embed::ElementModes::READ);
diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index fbe02ea6a9d5..f5b8455b037d 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -286,8 +286,8 @@ namespace sdbtools
{
Reference< XTablesSupplier > xSuppTables( _rxConnection, UNO_QUERY_THROW );
Reference< XQueriesSupplier > xQueriesSupplier( _rxConnection, UNO_QUERY_THROW );
- xTables.set( xSuppTables->getTables(), UNO_QUERY_THROW );
- xQueries.set( xQueriesSupplier->getQueries(), UNO_QUERY_THROW );
+ xTables.set( xSuppTables->getTables(), css::uno::UNO_SET_THROW );
+ xQueries.set( xQueriesSupplier->getQueries(), css::uno::UNO_SET_THROW );
}
catch( const Exception& )
{
@@ -318,7 +318,7 @@ namespace sdbtools
Reference< XDatabaseMetaData > xMeta;
try
{
- xMeta.set( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+ xMeta.set( _rxConnection->getMetaData(), css::uno::UNO_SET_THROW );
}
catch( const Exception& )
{
@@ -377,7 +377,7 @@ namespace sdbtools
OUString SAL_CALL ObjectNames::convertToSQLName( const OUString& Name )
{
EntryGuard aGuard( *this );
- Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), UNO_QUERY_THROW );
+ Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), css::uno::UNO_SET_THROW );
return ::dbtools::convertName2SQLName( Name, xMeta->getExtraNameCharacters() );
}
diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index 2766d590794f..91f2cf928ac5 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -118,7 +118,7 @@ namespace sdbtools
EntryGuard aGuard( *this );
Reference< XTablesSupplier > xSuppTables( getConnection(), UNO_QUERY_THROW );
- Reference< XNameAccess > xTables( xSuppTables->getTables(), UNO_QUERY_THROW );
+ Reference< XNameAccess > xTables( xSuppTables->getTables(), css::uno::UNO_SET_THROW );
Reference< XPropertySet > xTable;
try
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 2e4512575a3a..842a48c8c659 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -98,11 +98,11 @@ void OApplicationController::convertToView(const OUString& _sName)
{
SharedConnection xConnection( getConnection() );
Reference< XQueriesSupplier > xSup( xConnection, UNO_QUERY_THROW );
- Reference< XNameAccess > xQueries( xSup->getQueries(), UNO_QUERY_THROW );
+ Reference< XNameAccess > xQueries( xSup->getQueries(), UNO_SET_THROW );
Reference< XPropertySet > xSourceObject( xQueries->getByName( _sName ), UNO_QUERY_THROW );
Reference< XTablesSupplier > xTablesSup( xConnection, UNO_QUERY_THROW );
- Reference< XNameAccess > xTables( xTablesSup->getTables(), UNO_QUERY_THROW );
+ Reference< XNameAccess > xTables( xTablesSup->getTables(), UNO_SET_THROW );
Reference< XDatabaseMetaData > xMeta = xConnection->getMetaData();
@@ -296,8 +296,8 @@ Reference< XDataSource > SAL_CALL OApplicationController::getDataSource()
Reference< XWindow > SAL_CALL OApplicationController::getApplicationMainWindow()
{
::osl::MutexGuard aGuard( getMutex() );
- Reference< XFrame > xFrame( getFrame(), UNO_QUERY_THROW );
- Reference< XWindow > xWindow( xFrame->getContainerWindow(), UNO_QUERY_THROW );
+ Reference< XFrame > xFrame( getFrame(), UNO_SET_THROW );
+ Reference< XWindow > xWindow( xFrame->getContainerWindow(), UNO_SET_THROW );
return xWindow;
}
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 200b8edfa7c4..ec92901a2ab7 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -414,11 +414,11 @@ void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
// the tables participating in the statement
const Reference< XTablesSupplier > xSuppTables( xComposer, UNO_QUERY_THROW );
- const Reference< XNameAccess > xTableNames( xSuppTables->getTables(), UNO_QUERY_THROW );
+ const Reference< XNameAccess > xTableNames( xSuppTables->getTables(), UNO_SET_THROW );
// the columns participating in the statement
const Reference< XColumnsSupplier > xSuppColumns( xComposer, UNO_QUERY_THROW );
- const Reference< XNameAccess > xColumnNames( xSuppColumns->getColumns(), UNO_QUERY_THROW );
+ const Reference< XNameAccess > xColumnNames( xSuppColumns->getColumns(), UNO_SET_THROW );
// check if the order columns apply to tables which really exist in the statement
const Reference< XIndexAccess > xOrderColumns( xComposer->getOrderColumns(), UNO_SET_THROW );
@@ -449,7 +449,7 @@ void SbaTableQueryBrowser::impl_sanitizeRowSetClauses_nothrow()
}
const Reference< XColumnsSupplier > xSuppTableColumns( xTableNames->getByName( sTableName ), UNO_QUERY_THROW );
- const Reference< XNameAccess > xTableColumnNames( xSuppTableColumns->getColumns(), UNO_QUERY_THROW );
+ const Reference< XNameAccess > xTableColumnNames( xSuppTableColumns->getColumns(), UNO_SET_THROW );
if ( !xTableColumnNames->hasByName( sColumnName ) )
{
invalidColumn = true;
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 5dc8186b4c73..4cc0885d8112 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -258,7 +258,7 @@ void OTableTreeListBox::UpdateTableList(
aTables.resize(_rTables.getLength());
try
{
- Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+ Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_SET_THROW );
std::transform( _rTables.begin(), _rTables.end(),
aTables.begin(), OViewSetter( _rViews, xMeta->supportsMixedCaseQuotedIdentifiers() ) );
}
@@ -279,7 +279,7 @@ void TableTreeListBox::UpdateTableList(
aTables.resize(_rTables.getLength());
try
{
- Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+ Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_SET_THROW );
std::transform( _rTables.begin(), _rTables.end(),
aTables.begin(), OViewSetter( _rViews, xMeta->supportsMixedCaseQuotedIdentifiers() ) );
}
@@ -322,7 +322,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn
return;
// get the table/view names
- Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+ Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_SET_THROW );
for (auto const& table : _rTables)
{
// add the entry
@@ -406,7 +406,7 @@ void TableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConne
return;
// get the table/view names
- Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW );
+ Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_SET_THROW );
for (auto const& table : _rTables)
{
// add the entry
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 1a1d1035a6c7..1add8474188e 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list