[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - 79 commits - basegfx/source chart2/source codemaker/source compilerplugins/clang cppcanvas/source cui/source dbaccess/source desktop/source download.lst drawinglayer/source editeng/source external/fontconfig filter/source framework/source hwpfilter/source i18npool/source include/basegfx include/codemaker include/dbaccess include/oox include/sot include/svtools include/tools include/vbahelper include/vcl include/xmloff include/xmlscript l10ntools/source lotuswordpro/source o3tl/qa oox/source registry/source reportdesign/source sal/qa sal/rtl sccomp/source sc/inc scripting/source sc/source sdext/source sd/source sfx2/source slideshow/source solenv/bin solenv/gdb starmath/source stoc/source svtools/qa svtools/source svx/source sw/source tools/source vbahelper/source vcl/headless vcl/inc vcl/opengl vcl/qa vcl/quartz vcl/source vcl/unx vcl/win vcl/workben xmloff/source
Stephan Bergmann
sbergman at redhat.com
Tue Nov 28 05:15:04 UTC 2017
basegfx/source/polygon/b2dpolypolygon.cxx | 16
basegfx/source/polygon/b3dpolypolygon.cxx | 16
chart2/source/view/charttypes/GL3DBarChart.cxx | 1
codemaker/source/codemaker/exceptiontree.cxx | 9
codemaker/source/cppumaker/cpputype.cxx | 8
codemaker/source/javamaker/javatype.cxx | 4
compilerplugins/clang/unusedfields.cxx | 13
compilerplugins/clang/useuniqueptr.cxx | 182 ++++
cppcanvas/source/mtfrenderer/emfplus.cxx | 7
cui/source/dialogs/cuigrfflt.cxx | 24
cui/source/dialogs/hltpbase.cxx | 5
cui/source/options/optcolor.cxx | 2
cui/source/tabpages/macroass.cxx | 12
dbaccess/source/core/api/CacheSet.hxx | 46 +
dbaccess/source/core/api/KeySet.hxx | 4
dbaccess/source/core/api/RowSet.hxx | 5
dbaccess/source/core/api/RowSetBase.hxx | 2
dbaccess/source/core/dataaccess/ModelImpl.hxx | 1
dbaccess/source/core/dataaccess/connection.hxx | 1
dbaccess/source/core/dataaccess/databasecontext.hxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 1
dbaccess/source/core/dataaccess/databasedocument.hxx | 3
dbaccess/source/core/dataaccess/datasource.hxx | 4
dbaccess/source/core/dataaccess/documentdefinition.hxx | 1
dbaccess/source/core/dataaccess/intercept.hxx | 1
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 2
dbaccess/source/core/inc/TableDeco.hxx | 1
dbaccess/source/core/inc/table.hxx | 2
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 2
dbaccess/source/filter/xml/xmlExport.cxx | 4
dbaccess/source/filter/xml/xmlExport.hxx | 2
dbaccess/source/filter/xml/xmlfilter.hxx | 3
dbaccess/source/inc/apitools.hxx | 7
dbaccess/source/ui/app/AppController.hxx | 2
dbaccess/source/ui/inc/RelationController.hxx | 2
dbaccess/source/ui/inc/TableController.hxx | 4
dbaccess/source/ui/inc/exsrcbrw.hxx | 2
dbaccess/source/ui/inc/formadapter.hxx | 1
dbaccess/source/ui/inc/querycontroller.hxx | 2
dbaccess/source/ui/inc/sbagrid.hxx | 2
dbaccess/source/ui/inc/unodatbr.hxx | 2
dbaccess/source/ui/inc/unosqlmessage.hxx | 2
dbaccess/source/ui/querydesign/limitboxcontroller.hxx | 8
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 2
dbaccess/source/ui/uno/ColumnControl.hxx | 8
dbaccess/source/ui/uno/ColumnModel.hxx | 8
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 2
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 2
dbaccess/source/ui/uno/TableFilterDlg.hxx | 2
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 2
dbaccess/source/ui/uno/admindlg.hxx | 2
dbaccess/source/ui/uno/composerdialogs.hxx | 16
dbaccess/source/ui/uno/copytablewizard.cxx | 2
dbaccess/source/ui/uno/dbinteraction.hxx | 16
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 8
dbaccess/source/ui/uno/unoDirectSql.hxx | 8
desktop/source/app/app.cxx | 5
download.lst | 3
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 2
drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx | 2
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 1
drawinglayer/source/processor2d/vclprocessor2d.cxx | 2
editeng/source/editeng/impedit2.cxx | 3
editeng/source/outliner/outlvw.cxx | 5
external/fontconfig/UnpackedTarball_fontconfig.mk | 4
external/fontconfig/fontconfig-2.12.1.patch.1 | 135 +++
external/fontconfig/fontconfig-2.8.0.patch | 64 -
filter/source/graphicfilter/egif/egif.cxx | 8
filter/source/graphicfilter/eps/eps.cxx | 16
filter/source/msfilter/msdffimp.cxx | 6
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 10
framework/source/layoutmanager/layoutmanager.cxx | 1
framework/source/services/autorecovery.cxx | 1
framework/source/uielement/menubarmanager.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 1
hwpfilter/source/hwpreader.cxx | 7
hwpfilter/source/hwpreader.hxx | 4
i18npool/source/localedata/LocaleNode.cxx | 17
include/basegfx/raster/bpixelraster.hxx | 5
include/basegfx/raster/bzpixelraster.hxx | 5
include/codemaker/exceptiontree.hxx | 3
include/dbaccess/IController.hxx | 2
include/oox/helper/binaryinputstream.hxx | 2
include/oox/helper/containerhelper.hxx | 2
include/sot/filelist.hxx | 4
include/svtools/grfmgr.hxx | 24
include/tools/color.hxx | 2
include/tools/colordata.hxx | 2
include/tools/stream.hxx | 12
include/vbahelper/vbadialogbase.hxx | 1
include/vbahelper/vbadialogsbase.hxx | 1
include/vbahelper/vbadocumentbase.hxx | 1
include/vbahelper/vbadocumentsbase.hxx | 1
include/vbahelper/vbapagesetupbase.hxx | 1
include/vbahelper/vbatextframe.hxx | 1
include/vcl/bitmap.hxx | 73 -
include/vcl/bitmapaccess.hxx | 429 ++++------
include/vcl/builder.hxx | 2
include/vcl/button.hxx | 72 -
include/vcl/commandevent.hxx | 4
include/vcl/dockwin.hxx | 8
include/vcl/field.hxx | 94 +-
include/vcl/gdimtf.hxx | 2
include/vcl/graph.hxx | 23
include/vcl/graphicfilter.hxx | 32
include/vcl/idle.hxx | 1
include/vcl/lazydelete.hxx | 2
include/vcl/longcurr.hxx | 32
include/vcl/metaact.hxx | 5
include/vcl/metric.hxx | 2
include/vcl/msgbox.hxx | 7
include/vcl/oldprintadaptor.hxx | 2
include/vcl/pdfwriter.hxx | 1
include/vcl/print.hxx | 4
include/vcl/printerinfomanager.hxx | 3
include/vcl/salbtype.hxx | 287 ++-----
include/vcl/salctype.hxx | 1
include/vcl/scopedbitmapaccess.hxx | 40
include/vcl/spinfld.hxx | 70 -
include/vcl/syswin.hxx | 7
include/vcl/textdata.hxx | 3
include/vcl/timer.hxx | 2
include/vcl/txtattr.hxx | 4
include/xmloff/XMLCharContext.hxx | 2
include/xmloff/XMLEventsImportContext.hxx | 2
include/xmloff/XMLShapeStyleContext.hxx | 4
include/xmloff/controlpropertyhdl.hxx | 1
include/xmloff/formlayerexport.hxx | 1
include/xmloff/styleexp.hxx | 10
include/xmloff/txtparae.hxx | 5
include/xmloff/xmlexp.hxx | 4
include/xmlscript/xml_helper.hxx | 6
l10ntools/source/lngmerge.cxx | 7
l10ntools/source/propmerge.cxx | 6
lotuswordpro/source/filter/lwpbreaksoverride.cxx | 7
lotuswordpro/source/filter/lwpbreaksoverride.hxx | 2
lotuswordpro/source/filter/lwpcelllayout.cxx | 4
lotuswordpro/source/filter/lwpcharacterstyle.cxx | 26
lotuswordpro/source/filter/lwpcontent.cxx | 2
lotuswordpro/source/filter/lwpdivinfo.cxx | 26
lotuswordpro/source/filter/lwpdivopts.cxx | 4
lotuswordpro/source/filter/lwpdlvlist.cxx | 6
lotuswordpro/source/filter/lwpdoc.cxx | 34
lotuswordpro/source/filter/lwpdocdata.cxx | 46 -
lotuswordpro/source/filter/lwpfootnote.cxx | 18
lotuswordpro/source/filter/lwpframelayout.cxx | 10
lotuswordpro/source/filter/lwpframelayout.hxx | 4
lotuswordpro/source/filter/lwpfrib.cxx | 3
lotuswordpro/source/filter/lwpfrib.hxx | 4
lotuswordpro/source/filter/lwpgrfobj.cxx | 5
lotuswordpro/source/filter/lwpholder.cxx | 8
lotuswordpro/source/filter/lwpidxmgr.cxx | 19
lotuswordpro/source/filter/lwplayout.cxx | 9
lotuswordpro/source/filter/lwplayout.hxx | 2
lotuswordpro/source/filter/lwplaypiece.cxx | 30
lotuswordpro/source/filter/lwpmarker.cxx | 24
lotuswordpro/source/filter/lwpnotes.cxx | 6
lotuswordpro/source/filter/lwpnumericfmt.hxx | 2
lotuswordpro/source/filter/lwpobj.cxx | 9
lotuswordpro/source/filter/lwpobj.hxx | 2
lotuswordpro/source/filter/lwpoleobject.cxx | 8
lotuswordpro/source/filter/lwppagehint.cxx | 12
lotuswordpro/source/filter/lwppagelayout.cxx | 4
lotuswordpro/source/filter/lwppara.cxx | 18
lotuswordpro/source/filter/lwpparaproperty.cxx | 1
lotuswordpro/source/filter/lwpparaproperty.hxx | 4
lotuswordpro/source/filter/lwpparastyle.cxx | 34
lotuswordpro/source/filter/lwppiece.hxx | 2
lotuswordpro/source/filter/lwpproplist.cxx | 4
lotuswordpro/source/filter/lwprowlayout.cxx | 4
lotuswordpro/source/filter/lwpsection.cxx | 18
lotuswordpro/source/filter/lwpsilverbullet.cxx | 5
lotuswordpro/source/filter/lwpsilverbullet.hxx | 2
lotuswordpro/source/filter/lwpstory.cxx | 5
lotuswordpro/source/filter/lwpstory.hxx | 4
lotuswordpro/source/filter/lwptable.cxx | 10
lotuswordpro/source/filter/lwptablelayout.cxx | 9
lotuswordpro/source/filter/lwptabrack.cxx | 4
lotuswordpro/source/filter/lwptblcell.cxx | 26
lotuswordpro/source/filter/lwptblformula.cxx | 6
lotuswordpro/source/filter/lwptoc.cxx | 16
lotuswordpro/source/filter/lwpverdocument.cxx | 4
lotuswordpro/source/filter/lwpvpointer.cxx | 2
lotuswordpro/source/filter/tocread.cxx | 10
lotuswordpro/source/filter/tocread.hxx | 5
lotuswordpro/source/filter/xfilter/xfcell.cxx | 5
lotuswordpro/source/filter/xfilter/xfcell.hxx | 5
lotuswordpro/source/filter/xfilter/xfcellstyle.cxx | 4
lotuswordpro/source/filter/xfilter/xfcellstyle.hxx | 4
lotuswordpro/source/filter/xfilter/xfsaxstream.cxx | 5
lotuswordpro/source/filter/xfilter/xfsaxstream.hxx | 3
lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx | 4
lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx | 3
lotuswordpro/source/filter/xfilter/xftablestyle.cxx | 5
lotuswordpro/source/filter/xfilter/xftablestyle.hxx | 3
o3tl/qa/test-sorted_vector.cxx | 150 +--
oox/source/dump/dumperbase.cxx | 4
oox/source/helper/binaryinputstream.cxx | 2
oox/source/ole/vbainputstream.cxx | 2
registry/source/reflwrit.cxx | 4
registry/source/regimpl.cxx | 7
reportdesign/source/ui/dlg/Condition.cxx | 2
sal/qa/osl/process/osl_Thread.cxx | 10
sal/qa/rtl/oustring/rtl_OUString2.cxx | 5
sal/qa/rtl/process/rtl_Process.cxx | 5
sal/qa/rtl/random/rtl_random.cxx | 50 -
sal/rtl/cipher.cxx | 24
sal/rtl/digest.cxx | 16
sc/inc/addincol.hxx | 5
sc/inc/appoptio.hxx | 7
sc/inc/attrib.hxx | 2
sc/inc/chartlis.hxx | 3
sc/inc/chartpos.hxx | 27
sc/inc/chgviset.hxx | 3
sc/inc/dociter.hxx | 9
sc/inc/dpgroup.hxx | 3
sc/inc/dpresfilter.hxx | 2
sc/inc/dpsave.hxx | 4
sc/inc/dptabres.hxx | 15
sc/inc/dptabsrc.hxx | 3
sc/inc/editutil.hxx | 2
sc/inc/paramisc.hxx | 8
sc/inc/patattr.hxx | 7
sc/inc/prnsave.hxx | 5
sc/inc/rangenam.hxx | 7
sc/source/core/data/attrib.cxx | 11
sc/source/core/data/dociter.cxx | 26
sc/source/core/data/dpgroup.cxx | 3
sc/source/core/data/dpresfilter.cxx | 8
sc/source/core/data/dpsave.cxx | 14
sc/source/core/data/dptabres.cxx | 10
sc/source/core/data/dptabsrc.cxx | 8
sc/source/core/data/global2.cxx | 7
sc/source/core/data/patattr.cxx | 17
sc/source/core/inc/addinlis.hxx | 2
sc/source/core/tool/addincol.cxx | 11
sc/source/core/tool/addinlis.cxx | 7
sc/source/core/tool/appoptio.cxx | 12
sc/source/core/tool/callform.cxx | 6
sc/source/core/tool/chartlis.cxx | 14
sc/source/core/tool/chartpos.cxx | 47 -
sc/source/core/tool/chgviset.cxx | 9
sc/source/core/tool/editutil.cxx | 5
sc/source/core/tool/prnsave.cxx | 5
sc/source/core/tool/rangenam.cxx | 9
sc/source/core/tool/rangeutl.cxx | 8
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xiescher.cxx | 4
sc/source/filter/excel/xistream.cxx | 8
sc/source/filter/excel/xlformula.cxx | 6
sc/source/filter/inc/fapihelper.hxx | 2
sc/source/filter/inc/xlformula.hxx | 2
sc/source/filter/oox/biffcodec.cxx | 6
sc/source/filter/rtf/eeimpars.cxx | 7
sc/source/ui/app/scmod.cxx | 3
sc/source/ui/condformat/condformatdlgentry.cxx | 4
sc/source/ui/dbgui/sortkeydlg.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 1
sc/source/ui/miscdlgs/acredlin.cxx | 1
sc/source/ui/miscdlgs/conflictsdlg.cxx | 1
sc/source/ui/view/formatsh.cxx | 3
sccomp/source/solver/LpsolveSolver.cxx | 6
scripting/source/stringresource/stringresource.cxx | 8
sd/source/filter/eppt/pptexsoundcollection.cxx | 7
sd/source/filter/ppt/pptin.cxx | 8
sd/source/filter/ppt/propread.cxx | 47 -
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2
sd/source/ui/dlg/brkdlg.cxx | 9
sd/source/ui/dlg/filedlg.cxx | 1
sd/source/ui/docshell/docshel2.cxx | 5
sd/source/ui/inc/BreakDlg.hxx | 2
sd/source/ui/remotecontrol/BluetoothServer.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 8
sdext/source/presenter/PresenterAccessibility.cxx | 2
sfx2/source/appl/appcfg.cxx | 1
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/control/bindings.cxx | 53 -
sfx2/source/control/dispatch.cxx | 1
sfx2/source/control/itemdel.cxx | 2
sfx2/source/dialog/backingwindow.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 8
sfx2/source/dialog/dockwin.cxx | 1
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/doc/graphhelp.cxx | 2
sfx2/source/doc/oleprops.cxx | 6
sfx2/source/sidebar/Theme.cxx | 2
slideshow/source/engine/slide/targetpropertiescreator.cxx | 2
solenv/bin/install-gdb-printers | 3
solenv/gdb/libreoffice/vcl.py | 90 ++
starmath/source/mathmlexport.cxx | 12
stoc/source/inspect/introspection.cxx | 7
svtools/qa/unit/GraphicObjectTest.cxx | 2
svtools/source/contnr/imivctl1.cxx | 20
svtools/source/contnr/svimpbox.cxx | 2
svtools/source/contnr/svtabbx.cxx | 5
svtools/source/contnr/treelistbox.cxx | 1
svtools/source/control/ruler.cxx | 6
svtools/source/control/tabbar.cxx | 5
svtools/source/graphic/grfcache.cxx | 2
svtools/source/graphic/grfmgr.cxx | 254 ++----
svtools/source/graphic/grfmgr2.cxx | 25
svtools/source/graphic/transformer.cxx | 4
svtools/source/misc/langtab.cxx | 2
svx/source/dialog/_bmpmask.cxx | 2
svx/source/dialog/_contdlg.cxx | 4
svx/source/dialog/ctredlin.cxx | 2
svx/source/dialog/grfflt.cxx | 16
svx/source/form/datanavi.cxx | 2
svx/source/form/fmshimp.cxx | 1
svx/source/gallery2/galobj.cxx | 8
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 1
svx/source/sidebar/PanelLayout.cxx | 3
svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 8
svx/source/svdraw/sdrpaintwindow.cxx | 2
svx/source/svdraw/svdetc.cxx | 3
svx/source/svdraw/svdoashp.cxx | 6
svx/source/svdraw/svdpntv.cxx | 1
svx/source/unodraw/unoshape.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 2
sw/source/core/access/accfrmobjmap.cxx | 11
sw/source/core/access/accpara.cxx | 7
sw/source/core/crsr/crsrsh.cxx | 7
sw/source/core/doc/DocumentStatisticsManager.cxx | 1
sw/source/core/doc/DocumentTimerManager.cxx | 1
sw/source/core/doc/doccomp.cxx | 19
sw/source/core/doc/docnew.cxx | 1
sw/source/core/frmedt/fecopy.cxx | 9
sw/source/core/layout/atrfrm.cxx | 49 -
sw/source/core/layout/paintfrm.cxx | 3
sw/source/core/text/pormulti.cxx | 5
sw/source/core/txtnode/SwGrammarContact.cxx | 1
sw/source/core/txtnode/fntcache.cxx | 72 -
sw/source/core/unocore/unochart.cxx | 1
sw/source/core/unocore/unodraw.cxx | 5
sw/source/filter/html/swhtml.cxx | 4
sw/source/filter/ww8/wrtw8esh.cxx | 7
sw/source/filter/ww8/wrtw8sty.cxx | 9
sw/source/filter/ww8/wrtww8.cxx | 20
sw/source/filter/ww8/wrtww8.hxx | 6
sw/source/filter/ww8/wrtww8gr.cxx | 3
sw/source/filter/ww8/ww8par2.cxx | 7
sw/source/filter/ww8/ww8scan.cxx | 50 -
sw/source/filter/ww8/ww8scan.hxx | 9
sw/source/filter/ww8/ww8toolbar.cxx | 6
sw/source/filter/ww8/ww8toolbar.hxx | 5
sw/source/ui/chrdlg/chardlg.cxx | 3
sw/source/ui/index/cnttab.cxx | 4
sw/source/ui/index/swuiidxmrk.cxx | 4
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 7
sw/source/uibase/inc/swuiidxmrk.hxx | 4
sw/source/uibase/misc/swruler.cxx | 1
sw/source/uibase/uiview/view.cxx | 1
tools/source/generic/poly.cxx | 3
tools/source/inet/inetmime.cxx | 7
vbahelper/source/msforms/vbapages.hxx | 1
vcl/headless/svpbmp.cxx | 5
vcl/headless/svpglyphcache.cxx | 8
vcl/headless/svpinst.cxx | 2
vcl/inc/BitmapScaleConvolution.hxx | 5
vcl/inc/bitmapfilter.hxx | 8
vcl/inc/bitmapscalesuper.hxx | 10
vcl/inc/canvasbitmap.hxx | 4
vcl/inc/controldata.hxx | 7
vcl/inc/headless/svpbmp.hxx | 1
vcl/inc/impbmp.hxx | 6
vcl/inc/impoctree.hxx | 48 -
vcl/inc/opengl/salbmp.hxx | 1
vcl/inc/opengl/x11/salvd.hxx | 3
vcl/inc/quartz/salbmp.h | 1
vcl/inc/salbmp.hxx | 1
vcl/inc/svmconverter.hxx | 1
vcl/inc/unx/gendata.hxx | 1
vcl/inc/unx/geninst.h | 2
vcl/inc/unx/i18n_xkb.hxx | 6
vcl/inc/unx/salbmp.h | 1
vcl/inc/win/salbmp.h | 1
vcl/opengl/scale.cxx | 5
vcl/opengl/x11/salvd.cxx | 3
vcl/qa/cppunit/BitmapTest.cxx | 2
vcl/qa/cppunit/jpeg/JpegReaderTest.cxx | 2
vcl/quartz/salbmp.cxx | 5
vcl/source/app/help.cxx | 8
vcl/source/app/svapp.cxx | 2
vcl/source/app/timer.cxx | 3
vcl/source/bitmap/BitmapProcessor.cxx | 25
vcl/source/bitmap/BitmapScaleConvolution.cxx | 14
vcl/source/bitmap/bitmapfilter.cxx | 2
vcl/source/bitmap/bitmapscalesuper.cxx | 94 +-
vcl/source/control/button.cxx | 11
vcl/source/control/combobox.cxx | 2
vcl/source/control/ctrl.cxx | 8
vcl/source/control/edit.cxx | 20
vcl/source/control/field.cxx | 3
vcl/source/control/fixed.cxx | 4
vcl/source/control/group.cxx | 2
vcl/source/control/imp_listbox.cxx | 6
vcl/source/control/listbox.cxx | 2
vcl/source/control/notebookbar.cxx | 2
vcl/source/control/quickselectionengine.cxx | 1
vcl/source/control/scrbar.cxx | 1
vcl/source/control/spinfld.cxx | 2
vcl/source/control/tabctrl.cxx | 16
vcl/source/edit/textdata.cxx | 9
vcl/source/edit/textdoc.cxx | 5
vcl/source/edit/texteng.cxx | 1
vcl/source/filter/graphicfilter.cxx | 6
vcl/source/filter/igif/gifread.cxx | 60 -
vcl/source/filter/ixbm/xbmread.cxx | 24
vcl/source/filter/ixpm/xpmread.cxx | 42 -
vcl/source/filter/jpeg/JpegWriter.cxx | 8
vcl/source/filter/jpeg/JpegWriter.hxx | 2
vcl/source/filter/wmf/winmtf.cxx | 14
vcl/source/filter/wmf/winwmf.cxx | 10
vcl/source/fontsubset/cff.cxx | 6
vcl/source/gdi/alpha.cxx | 19
vcl/source/gdi/bitmap.cxx | 482 ++++-------
vcl/source/gdi/bitmap3.cxx | 183 ++--
vcl/source/gdi/bitmap4.cxx | 121 +-
vcl/source/gdi/bitmapex.cxx | 69 -
vcl/source/gdi/bmpacc.cxx | 40
vcl/source/gdi/bmpacc2.cxx | 48 -
vcl/source/gdi/dibtools.cxx | 490 ++++++------
vcl/source/gdi/embeddedfontshelper.cxx | 2
vcl/source/gdi/gdimtf.cxx | 2
vcl/source/gdi/graph.cxx | 12
vcl/source/gdi/impbmp.cxx | 8
vcl/source/gdi/impgraph.cxx | 19
vcl/source/gdi/impvect.cxx | 33
vcl/source/gdi/metaact.cxx | 24
vcl/source/gdi/oldprintadaptor.cxx | 1
vcl/source/gdi/pdffontcache.hxx | 1
vcl/source/gdi/pdfwriter_impl.cxx | 30
vcl/source/gdi/pdfwriter_impl.hxx | 7
vcl/source/gdi/pdfwriter_impl2.cxx | 4
vcl/source/gdi/pngread.cxx | 107 +-
vcl/source/gdi/pngwrite.cxx | 22
vcl/source/gdi/print.cxx | 2
vcl/source/gdi/print2.cxx | 8
vcl/source/gdi/print3.cxx | 1
vcl/source/gdi/salgdilayout.cxx | 10
vcl/source/helper/canvasbitmap.cxx | 9
vcl/source/outdev/bitmap.cxx | 66 -
vcl/source/outdev/text.cxx | 4
vcl/source/outdev/transparent.cxx | 10
vcl/source/window/commandevent.cxx | 17
vcl/source/window/cursor.cxx | 1
vcl/source/window/dialog.cxx | 1
vcl/source/window/dockingarea.cxx | 5
vcl/source/window/dockmgr.cxx | 3
vcl/source/window/dockwin.cxx | 9
vcl/source/window/floatwin.cxx | 5
vcl/source/window/menubarwindow.hxx | 1
vcl/source/window/menufloatingwindow.cxx | 5
vcl/source/window/msgbox.cxx | 4
vcl/source/window/popupmenuwindow.cxx | 5
vcl/source/window/printdlg.cxx | 6
vcl/source/window/scrwnd.cxx | 1
vcl/source/window/seleng.cxx | 1
vcl/source/window/splitwin.cxx | 1
vcl/source/window/status.cxx | 5
vcl/source/window/syswin.cxx | 24
vcl/source/window/tabpage.cxx | 2
vcl/source/window/toolbox.cxx | 12
vcl/source/window/window2.cxx | 1
vcl/source/window/wrkwin.cxx | 2
vcl/unx/generic/app/geninst.cxx | 9
vcl/unx/generic/app/i18n_im.cxx | 5
vcl/unx/generic/dtrans/X11_selection.hxx | 1
vcl/unx/generic/dtrans/bmp.cxx | 8
vcl/unx/generic/gdi/salbmp.cxx | 5
vcl/unx/generic/printer/ppdparser.cxx | 1
vcl/unx/generic/printer/printerinfomanager.cxx | 6
vcl/unx/generic/window/salframe.cxx | 5
vcl/win/gdi/salbmp.cxx | 7
vcl/workben/fftester.cxx | 34
vcl/workben/outdevgrind.cxx | 2
vcl/workben/vcldemo.cxx | 8
xmloff/source/text/txtparae.cxx | 2
481 files changed, 3469 insertions(+), 3556 deletions(-)
New commits:
commit efb1db0b656d7ffe57a9b3cc23c7ebeb1b319f26
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Jan 19 17:58:58 2017 +0100
New loplugin:dynexcspec: Add @throws documentation, dbaccess
Change-Id: I117be0dca3cc5e204414613123422b4b0716d8ed
(cherry picked from commit 4c81fe62c16b0ebc7f86ff589880169247584c8e)
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 88e005814aa6..f813114c9179 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -69,6 +69,8 @@ namespace dbaccess
,OUStringBuffer& _sCondition
,OUStringBuffer& _sParameter
,::std::vector< sal_Int32>& _rOrgValues);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
void fillTableName(const css::uno::Reference< css::beans::XPropertySet>& _xTable) throw(css::sdbc::SQLException, css::uno::RuntimeException);
OUString getIdentifierQuoteString() const;
@@ -100,29 +102,73 @@ namespace dbaccess
virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
// css::sdbc::XResultSet
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL next() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL first() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL last() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
// css::sdbcx::XRowLocate
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual css::uno::Any SAL_CALL getBookmark() throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
// css::sdbc::XResultSetUpdate
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual void SAL_CALL insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual void SAL_CALL updateRow( const ORowSetRow& _rInsertRow,const ORowSetRow& _rOriginalRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
virtual void SAL_CALL deleteRow( const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) = 0;
virtual bool isResultSetChanged() const;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index cd18b333a5a3..311921ac5147 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -138,6 +138,8 @@ namespace dbaccess
sal_Int32 _nType,
sal_Int32 _nScale );
OUStringBuffer createKeyFilter( );
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
bool doTryRefetch_throw() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch);
void executeUpdate(const ORowSetRow& _rInsertRow, const ORowSetRow& _rOriginalRow, const OUString& i_sSQL, const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>());
@@ -195,6 +197,8 @@ namespace dbaccess
virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
virtual bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override;
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
void SAL_CALL ensureRowForData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException);
virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override;
// css::sdbcx::XRowLocate
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index b190d3c58d8b..01a85fbfd1e9 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -195,6 +195,8 @@ namespace dbaccess
impl_prepareAndExecute_throw();
void impl_ensureStatement_throw();
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
css::uno::Reference< css::sdbc::XConnection > calcConnection(const css::uno::Reference< css::task::XInteractionHandler >& _rxHandler) throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception );
// free clones and ParseTree. Plus, if _bComplete is <TRUE/>, *all* other associated resources
void freeResources( bool _bComplete );
@@ -395,7 +397,8 @@ namespace dbaccess
void execute_NoApprove_NoNewConn(::osl::ResettableMutexGuard& _rClearForNotification);
/** call the RowSetApproveListeners<p/>
- throws an RowSetVetoException if one of the listeners vetoed
+ @throws css::sdb::RowSetVetoException if one of the listeners vetoed
+ @throws css::uno::RuntimeException
*/
void approveExecution() throw (css::sdb::RowSetVetoException, css::uno::RuntimeException);
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index d31d0a5c563f..9078c9bee44d 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -183,6 +183,8 @@ namespace dbaccess
const connectivity::ORowSetValue& impl_getValue(sal_Int32 columnIndex);
// sets the current and the bookmark
void setCurrentRow( bool _bMoved, bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
void checkPositioningAllowed() throw(css::sdbc::SQLException, css::uno::RuntimeException);
// checks if the cache is null
void checkCache();
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 8ed40c89b4b4..91452777ee62 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -276,6 +276,7 @@ public:
);
// XEventListener
+ /// @throws css::uno::RuntimeException
void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException);
void setModified( bool bModified );
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 30c2ac1a8196..d1258f211467 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -197,6 +197,7 @@ public:
virtual void refresh(const css::uno::Reference< css::container::XNameAccess >& _rToBeRefreshed) override;
protected:
+ /// @throws css::lang::DisposedException
inline void checkDisposed() throw (css::lang::DisposedException)
{
if ( rBHelper.bDisposed || !m_xConnection.is() )
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index 611ffa80886b..14f4a0ba9568 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -126,7 +126,9 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo - static methods
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::uno::XComponentContext >&);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 4d28b3756ea7..d8883db1a5e2 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -374,6 +374,7 @@ static const char sPictures[] = "Pictures";
// document for anything, I believe this is a valid assumption ( as much as
// I could check anyway )
+/// @throws RuntimeException
void lcl_uglyHackToStoreDialogeEmbedImages( const Reference< XStorageBasedLibraryContainer >& xDlgCont, const Reference< XStorage >& xStorage, const Reference< XModel >& rxModel, const Reference<XComponentContext >& rxContext ) throw ( RuntimeException )
{
Sequence< OUString > sLibraries = xDlgCont->getElementNames();
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index 61452235aad1..afdd5ffb350c 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -210,6 +210,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
notify the proper events for this type.
@param _rGuard
the instance lock to be released before doing synchronous notifications
+ @throws css::io::IOException
+ @throws css::uno::RuntimeException
*/
void impl_storeAs_throw(
const OUString& _rURL,
@@ -466,6 +468,7 @@ public:
}
private:
+ /// @throws css::uno::RuntimeException
css::uno::Reference< css::ui::XUIConfigurationManager2 > const & getUIConfigurationManager2() throw (css::uno::RuntimeException);
/** returns whether the model is currently being initialized
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index e5c4f0b5b8cc..1ea921cfaa0f 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -202,7 +202,11 @@ private:
const OUString& user, const OUString& password
);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , bool _bIsolated) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception);
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated) throw(css::sdbc::SQLException, css::uno::RuntimeException);
protected:
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index d9f12b977bbd..bef6c99c9485 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -319,6 +319,7 @@ private:
//- commands
void onCommandGetDocumentProperties( css::uno::Any& _rProps );
+ /// @throws css::uno::Exception
void onCommandInsert( const OUString& _sURL, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) throw( css::uno::Exception );
void onCommandPreview( css::uno::Any& _rImage );
css::uno::Any
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx
index 80675245446e..09abd00b694a 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -44,6 +44,7 @@ public:
explicit OInterceptor( ODocumentDefinition* _pContentHolder );
+ /// @throws css::uno::RuntimeException
void SAL_CALL dispose() throw(css::uno::RuntimeException);
//XDispatch
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index f4917694adcd..5f7f0150bb30 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -57,7 +57,9 @@ public:
explicit DatabaseDataProvider(css::uno::Reference< css::uno::XComponentContext > const & context);
// css::lang::XServiceInfo - static methods
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(css::uno::Reference< css::uno::XComponentContext > const & context);
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index b8b8f501fc33..9b818fd38bfd 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -110,6 +110,7 @@ namespace dbaccess
the connection the table belongs to. Must not be <NULL/>
@param _rxTable
the table from the driver can be <NULL/>
+ @throws css::sdbc::SQLException
*/
ODBTableDecorator(
const css::uno::Reference< css::sdbc::XConnection >& _rxConn,
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 824210219018..cb8d2c106cb0 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -102,6 +102,7 @@ namespace dbaccess
@param _rName the name of the table
@param _rType the type of the table, as supplied by the driver
@param _rDesc the description of the table, as supplied by the driver
+ @throws css::sdbc::SQLException
*/
ODBTable(connectivity::sdbcx::OCollection* _pTables
,const css::uno::Reference< css::sdbc::XConnection >& _rxConn
@@ -113,6 +114,7 @@ namespace dbaccess
,const css::uno::Reference< css::container::XNameAccess >& _rxColumnDefinitions)
throw(css::sdbc::SQLException);
+ /// @throws css::sdbc::SQLException
ODBTable(connectivity::sdbcx::OCollection* _pTables
,const css::uno::Reference< css::sdbc::XConnection >& _rxConn)
throw(css::sdbc::SQLException);
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index e92f53861231..e663add04934 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -79,7 +79,9 @@ namespace dbmm
// helper for factories
static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& _rxContext );
+ /// @throws RuntimeException
static OUString SAL_CALL getImplementationName_static() throw(RuntimeException);
+ /// @throws RuntimeException
static Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw(RuntimeException);
protected:
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 43d530df2e7f..e95217080c35 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -67,14 +67,18 @@ namespace dbaxml
class ODBExportHelper
{
public:
+ /// @throws RuntimeException
static OUString SAL_CALL getImplementationName_Static( ) throw (RuntimeException);
+ /// @throws RuntimeException
static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(RuntimeException);
static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
};
class ODBFullExportHelper
{
public:
+ /// @throws RuntimeException
static OUString SAL_CALL getImplementationName_Static( ) throw (RuntimeException);
+ /// @throws RuntimeException
static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(RuntimeException);
static Reference< XInterface > SAL_CALL Create(const Reference< css::lang::XMultiServiceFactory >&);
};
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 3949daf2143a..d4b02a06eaff 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -173,9 +173,11 @@ public:
ODBExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, SvXMLExportFlags nExportFlag = SvXMLExportFlags::CONTENT | SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::PRETTY | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::SCRIPTS );
+ /// @throws css::uno::RuntimeException
static OUString SAL_CALL getImplementationName_Static()
throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames_Static() throw (css::uno::RuntimeException);
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index d278af645b35..6c12c75d217b 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -83,6 +83,7 @@ private:
Reference<XPropertySet> m_xDataSource;
bool m_bNewFormat;
+ /// @throws RuntimeException
bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
/** fills the map with the Properties
@@ -110,9 +111,11 @@ public:
// XFilter
virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception) override;
+ /// @throws css::uno::RuntimeException
static OUString SAL_CALL getImplementationName_Static()
throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames_Static() throw (css::uno::RuntimeException);
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 4937a23856e5..9561bb6d2d5c 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -112,13 +112,6 @@ public:
return aSupported; \
} \
-#define DECLARE_SERVICE_INFO_STATIC() \
- DECLARE_SERVICE_INFO(); \
- static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); \
- static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); \
- static css::uno::Reference< css::uno::XInterface > \
- SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&) \
-
#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 353db33e0639..a66c08117709 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -386,7 +386,9 @@ namespace dbaui
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// need by registration
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index d1e8df2fcbf9..ffa45ffc6ef3 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.hxx
@@ -58,7 +58,9 @@ namespace dbaui
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// need by registration
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index fb12a172219e..9192616f2e82 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -57,6 +57,8 @@ namespace dbaui
void reSyncRows();
void assignTable(); // set the table if a name is given
void loadData();
+ /// @throws css::sdbc::SQLException
+ /// @throws css::uno::RuntimeException
bool checkColumns(bool _bNew)
throw (css::sdbc::SQLException,
css::uno::RuntimeException, std::exception); // check if we have double column names
@@ -125,7 +127,9 @@ namespace dbaui
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// need by registration
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx
index f43c749519f8..9da081fa990f 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -44,7 +44,9 @@ namespace dbaui
public:
SbaExternalSourceBrowser(const css::uno::Reference< css::uno::XComponentContext >& _rM);
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 10680b3c1d95..045accdf1ef0 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -426,6 +426,7 @@ namespace dbaui
protected:
// container handling
+ /// @throws css::lang::IllegalArgumentException
void implInsert(const css::uno::Any& aElement, sal_Int32 nIndex, const OUString* pNewElName = nullptr) throw(css::lang::IllegalArgumentException);
sal_Int32 implGetPos(const OUString& rName);
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 1d99b4c4eb2c..618f105045d4 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -176,7 +176,9 @@ namespace dbaui
virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// need by registration
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index db91388ed4df..550c3f30dcd3 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -72,7 +72,9 @@ namespace dbaui
OUString SAL_CALL getImplementationName() throw(std::exception) override;
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(std::exception) override;
// need by registration
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 93118a4225cd..9c28daec87a8 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -138,7 +138,9 @@ namespace dbaui
static sal_Int32 getDatabaseObjectType( EntryType _eType );
// need by registration
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 98d7e0b77e62..183932a9d687 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -51,7 +51,9 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo - static methods
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
index a7bcd7cabdf5..ecb79fdc60e1 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
@@ -41,7 +41,13 @@ class LimitBoxController: public svt::ToolboxController,
virtual void SAL_CALL release() throw () override;
/// XServiceInfo
- DECLARE_SERVICE_INFO_STATIC();
+ DECLARE_SERVICE_INFO();
+ /// @throws css::uno::RuntimeException
+ static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
/// XComponent
virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index b148f9c26544..d2123261919f 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -112,10 +112,12 @@ namespace dbaui
explicit OViewController(const Reference< XComponentContext >& _rM) : OQueryController(_rM){}
// need by registration
+ /// @throws RuntimeException
static OUString getImplementationName_Static() throw( RuntimeException )
{
return OUString("org.openoffice.comp.dbu.OViewDesign");
}
+ /// @throws RuntimeException
static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException )
{
Sequence<OUString> aSupported { "com.sun.star.sdb.ViewDesign" };
diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
index 300dac9ad222..6161774973e4 100644
--- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -50,7 +50,9 @@ namespace dbaui
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo - static methods
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx
index d057de4633dc..9e4f415f5b02 100644
--- a/dbaccess/source/ui/uno/ColumnControl.hxx
+++ b/dbaccess/source/ui/uno/ColumnControl.hxx
@@ -39,7 +39,13 @@ namespace dbaui
virtual OUString GetComponentServiceName() override;
// XServiceInfo
- DECLARE_SERVICE_INFO_STATIC();
+ DECLARE_SERVICE_INFO();
+ /// @throws css::uno::RuntimeException
+ static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
// css::awt::XControl
virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& _rToolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index da75eb4e74ab..f4a5b9aaaa27 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -73,7 +73,13 @@ public:
DECLARE_XINTERFACE( )
// css::lang::XServiceInfo
- DECLARE_SERVICE_INFO_STATIC();
+ DECLARE_SERVICE_INFO();
+ /// @throws css::uno::RuntimeException
+ static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes()
throw (css::uno::RuntimeException, std::exception) override;
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index f35a6c4ed9dc..19c632562cce 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -42,7 +42,9 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo - static methods
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index bb31037f89d5..15d888d2326c 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -44,7 +44,9 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo - static methods
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 4241bfa63763..4fddd73b2d19 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -42,7 +42,9 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo - static methods
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index 60b34f0ca42c..32514a67f69a 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -42,7 +42,9 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo - static methods
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index 256e28603301..da64c0c7ea83 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -42,7 +42,9 @@ public:
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
// XServiceInfo - static methods
+ /// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+ /// @throws css::uno::RuntimeException
static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
static css::uno::Reference< css::uno::XInterface >
SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index f3bfc920ede2..2f6dd6eae4a5 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -81,7 +81,13 @@ namespace dbaui
const css::uno::Reference< css::uno::XComponentContext >& _rxORB
);
- DECLARE_SERVICE_INFO_STATIC( );
+ DECLARE_SERVICE_INFO();
+ /// @throws css::uno::RuntimeException
+ static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
protected:
// own overridables
@@ -106,7 +112,13 @@ namespace dbaui
const css::uno::Reference< css::uno::XComponentContext >& _rxORB
);
- DECLARE_SERVICE_INFO_STATIC( );
+ DECLARE_SERVICE_INFO();
+ /// @throws css::uno::RuntimeException
+ static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
protected:
// own overridables
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 033e1f7f4f62..31f89eb4394d 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -150,7 +150,9 @@ namespace dbaui
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override;
// XServiceInfo - static methods
+ /// @throws RuntimeException
static Sequence< OUString > getSupportedServiceNames_Static() throw( RuntimeException );
+ /// @throws RuntimeException
static OUString getImplementationName_Static() throw( RuntimeException );
static Reference< XInterface > Create( const Reference< XMultiServiceFactory >& );
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 0ea184cc07ab..9e6184313974 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -133,7 +133,13 @@ namespace dbaui
}
// XServiceInfo
- DECLARE_SERVICE_INFO_STATIC();
+ DECLARE_SERVICE_INFO();
+ /// @throws css::uno::RuntimeException
+ static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
};
// SQLExceptionInteractionHandler
@@ -161,7 +167,13 @@ namespace dbaui
}
// XServiceInfo
- DECLARE_SERVICE_INFO_STATIC();
+ DECLARE_SERVICE_INFO();
+ /// @throws css::uno::RuntimeException
+ static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
};
} // namespace dbaui
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 7db87b8d2fd1..3970604e9b49 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -74,7 +74,13 @@ namespace dbaui
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) override;
- DECLARE_SERVICE_INFO_STATIC( );
+ DECLARE_SERVICE_INFO();
+ /// @throws css::uno::RuntimeException
+ static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
DECLARE_PROPERTYCONTAINER_DEFAULTS( );
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception, std::exception) override;
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index 89e29463824c..eae08a0aa01c 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -51,7 +51,13 @@ namespace dbaui
virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId()
throw (css::uno::RuntimeException, std::exception) override;
- DECLARE_SERVICE_INFO_STATIC( );
+ DECLARE_SERVICE_INFO();
+ /// @throws css::uno::RuntimeException
+ static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException);
+ /// @throws css::uno::RuntimeException
+ static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException);
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
DECLARE_PROPERTYCONTAINER_DEFAULTS( );
diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx
index f19ca143a1c0..f657fcf63852 100644
--- a/include/dbaccess/IController.hxx
+++ b/include/dbaccess/IController.hxx
@@ -119,6 +119,8 @@ namespace dbaui
This must be the same model as returned by XController::getModel, and might be <NULL/> when
the controller does not have an own model.
+
+ @throws css::uno::RuntimeException
*/
virtual css::uno::Reference< css::frame::XController >
getXController() throw( css::uno::RuntimeException ) = 0;
commit 58c171983d4f828d36bf1f6d8fb8329e69424c7e
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Aug 16 14:25:56 2017 +0200
remove UL/L suffixes from shift-by-constant expressions
Change-Id: Ia470f643e3eefeccc14183133603db260460bd53
Reviewed-on: https://gerrit.libreoffice.org/41212
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit 224b770fa77fe12ad5dc543ce020aca316b6558d)
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index e17f7c03309d..c580ffdfd73a 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -302,7 +302,7 @@ namespace drawinglayer
basegfx::B2DLineJoin aLineJoin)
{
// nSegments is for whole circle, adapt to half circle
- const sal_uInt32 nVerSeg(nSegments >> 1L);
+ const sal_uInt32 nVerSeg(nSegments >> 1);
std::vector< BasePrimitive3D* > aResultVector;
if(nVerSeg)
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index 6cb80766a359..42080eed51ca 100644
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
@@ -87,7 +87,7 @@ namespace drawinglayer
// different from forced to sphere texture coordinates,
// create a old version from it by rotating to old state before applying
// the texture coordinates to emulate old behaviour
- fRelativeAngle = F_2PI * ((double)((getHorizontalSegments() >> 1L) - 1L) / (double)getHorizontalSegments());
+ fRelativeAngle = F_2PI * ((double)((getHorizontalSegments() >> 1) - 1L) / (double)getHorizontalSegments());
basegfx::B3DHomMatrix aRot;
aRot.rotate(0.0, fRelativeAngle, 0.0);
aFill.transform(aRot);
diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index 3b7cd38fcad2..592d69ad458d 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -188,7 +188,7 @@ inline sal_uInt8 Color::GetLuminance() const
{
return static_cast<sal_uInt8>((COLORDATA_BLUE(mnColor) * 29UL +
COLORDATA_GREEN(mnColor) * 151UL +
- COLORDATA_RED(mnColor) * 76UL) >> 8UL);
+ COLORDATA_RED(mnColor) * 76UL) >> 8);
}
inline void Color::Merge( const Color& rMergeColor, sal_uInt8 cTransparency )
diff --git a/include/tools/colordata.hxx b/include/tools/colordata.hxx
index 1d0fb42b4e39..a87ce5e600b4 100644
--- a/include/tools/colordata.hxx
+++ b/include/tools/colordata.hxx
@@ -85,7 +85,7 @@ typedef sal_uInt32 ColorData;
#define COL_AUTHOR9_LIGHT RGB_COLORDATA(255, 231, 199)
#define COLOR_CHANNEL_MERGE( _def_cDst, _def_cSrc, _def_cSrcTrans ) \
- ((sal_uInt8)((((long)(_def_cDst)-(_def_cSrc))*(_def_cSrcTrans)+(((_def_cSrc)<<8L)|(_def_cDst)))>>8L))
+ ((sal_uInt8)((((long)(_def_cDst)-(_def_cSrc))*(_def_cSrcTrans)+(((_def_cSrc)<<8)|(_def_cDst)))>>8))
#endif
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 082c146d933b..474441719031 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -794,7 +794,7 @@ inline sal_uLong Bitmap::GetColorCount() const
inline sal_uLong Bitmap::GetSizeBytes() const
{
const Size aSizePix( GetSizePixel() );
- return( ( (sal_uLong) aSizePix.Width() * aSizePix.Height() * GetBitCount() ) >> 3UL );
+ return( ( (sal_uLong) aSizePix.Width() * aSizePix.Height() * GetBitCount() ) >> 3 );
}
#endif // INCLUDED_VCL_BITMAP_HXX
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 18f73aa6c943..5129ee76f54f 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -521,7 +521,7 @@ inline void ColorMask::SetColorFor8Bit( const BitmapColor& rColor, sal_uInt8* pP
inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const
{
- const sal_uInt32 nVal = pPixel[ 1 ] | ( (sal_uInt32) pPixel[ 0 ] << 8UL );
+ const sal_uInt32 nVal = pPixel[ 1 ] | ( (sal_uInt32) pPixel[ 0 ] << 8 );
MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor );
}
@@ -530,13 +530,13 @@ inline void ColorMask::SetColorFor16BitMSB( const BitmapColor& rColor, sal_uInt8
{
const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ );
- pPixel[ 0 ] = (sal_uInt8)(nVal >> 8U);
+ pPixel[ 0 ] = (sal_uInt8)(nVal >> 8);
pPixel[ 1 ] = (sal_uInt8) nVal;
}
inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, const sal_uInt8* pPixel ) const
{
- const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL );
+ const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8 );
MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor );
}
@@ -546,7 +546,7 @@ inline void ColorMask::SetColorFor16BitLSB( const BitmapColor& rColor, sal_uInt8
const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ );
pPixel[ 0 ] = (sal_uInt8) nVal;
- pPixel[ 1 ] = (sal_uInt8)(nVal >> 8U);
+ pPixel[ 1 ] = (sal_uInt8)(nVal >> 8);
}
inline void ColorMask::GetColorFor24Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const
@@ -565,16 +565,16 @@ inline void ColorMask::SetColorFor24Bit( const BitmapColor& rColor, sal_uInt8* p
inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, const sal_uInt8* pPixel ) const
{
- const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) |
- ( (sal_uInt32) pPixel[ 2 ] << 16UL ) | ( (sal_uInt32) pPixel[ 3 ] << 24UL );
+ const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8 ) |
+ ( (sal_uInt32) pPixel[ 2 ] << 16 ) | ( (sal_uInt32) pPixel[ 3 ] << 24 );
MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor );
}
inline void ColorMask::GetColorAndAlphaFor32Bit( BitmapColor& rColor, sal_uInt8& rAlpha, const sal_uInt8* pPixel ) const
{
- const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) |
- ( (sal_uInt32) pPixel[ 2 ] << 16UL ) | ( (sal_uInt32) pPixel[ 3 ] << 24UL );
+ const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8 ) |
+ ( (sal_uInt32) pPixel[ 2 ] << 16 ) | ( (sal_uInt32) pPixel[ 3 ] << 24 );
rAlpha = (sal_uInt8)(nVal >> 24);
MASK_TO_COLOR( nVal, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, rColor );
@@ -584,9 +584,9 @@ inline void ColorMask::SetColorFor32Bit( const BitmapColor& rColor, sal_uInt8* p
{
const sal_uInt32 nVal = COLOR_TO_MASK( rColor, maR.mnMask, maG.mnMask, maB.mnMask, maR.mnShift, maG.mnShift, maB.mnShift, 0/*nAlphaChannel*/ );
pPixel[ 0 ] = (sal_uInt8) nVal;
- pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8UL );
- pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16UL );
- pPixel[ 3 ] = (sal_uInt8) ( nVal >> 24UL );
+ pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8 );
+ pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16 );
+ pPixel[ 3 ] = (sal_uInt8) ( nVal >> 24 );
}
#endif // INCLUDED_VCL_SALBTYPE_HXX
diff --git a/sal/rtl/cipher.cxx b/sal/rtl/cipher.cxx
index 959aa8a3a7b3..0f9d7cc7bd8f 100644
--- a/sal/rtl/cipher.cxx
+++ b/sal/rtl/cipher.cxx
@@ -29,14 +29,14 @@
*
*======================================================================*/
#define RTL_CIPHER_NTOHL(c, l) \
- ((l) = ((sal_uInt32)(*((c)++))) << 24L, \
- (l) |= ((sal_uInt32)(*((c)++))) << 16L, \
+ ((l) = ((sal_uInt32)(*((c)++))) << 24, \
+ (l) |= ((sal_uInt32)(*((c)++))) << 16, \
(l) |= ((sal_uInt32)(*((c)++))) << 8L, \
(l) |= ((sal_uInt32)(*((c)++))))
#define RTL_CIPHER_HTONL(l, c) \
- (*((c)++) = (sal_uInt8)(((l) >> 24L) & 0xff), \
- *((c)++) = (sal_uInt8)(((l) >> 16L) & 0xff), \
+ (*((c)++) = (sal_uInt8)(((l) >> 24) & 0xff), \
+ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \
*((c)++) = (sal_uInt8)(((l) >> 8L) & 0xff), \
*((c)++) = (sal_uInt8)(((l) ) & 0xff))
@@ -50,17 +50,17 @@
SAL_FALLTHROUGH; \
case 7: (xr) |= ((sal_uInt32)(*(--(c)))) << 8L; \
SAL_FALLTHROUGH; \
- case 6: (xr) |= ((sal_uInt32)(*(--(c)))) << 16L; \
+ case 6: (xr) |= ((sal_uInt32)(*(--(c)))) << 16; \
SAL_FALLTHROUGH; \
- case 5: (xr) |= ((sal_uInt32)(*(--(c)))) << 24L; \
+ case 5: (xr) |= ((sal_uInt32)(*(--(c)))) << 24; \
SAL_FALLTHROUGH; \
case 4: (xl) = ((sal_uInt32)(*(--(c)))); \
SAL_FALLTHROUGH; \
case 3: (xl) |= ((sal_uInt32)(*(--(c)))) << 8L; \
SAL_FALLTHROUGH; \
- case 2: (xl) |= ((sal_uInt32)(*(--(c)))) << 16L; \
+ case 2: (xl) |= ((sal_uInt32)(*(--(c)))) << 16; \
SAL_FALLTHROUGH; \
- case 1: (xl) |= ((sal_uInt32)(*(--(c)))) << 24L; \
+ case 1: (xl) |= ((sal_uInt32)(*(--(c)))) << 24; \
} \
}
@@ -73,17 +73,17 @@
SAL_FALLTHROUGH; \
case 7: *(--(c)) = (sal_uInt8)(((xr) >> 8L) & 0xff); \
SAL_FALLTHROUGH; \
- case 6: *(--(c)) = (sal_uInt8)(((xr) >> 16L) & 0xff); \
+ case 6: *(--(c)) = (sal_uInt8)(((xr) >> 16) & 0xff); \
SAL_FALLTHROUGH; \
- case 5: *(--(c)) = (sal_uInt8)(((xr) >> 24L) & 0xff); \
+ case 5: *(--(c)) = (sal_uInt8)(((xr) >> 24) & 0xff); \
SAL_FALLTHROUGH; \
case 4: *(--(c)) = (sal_uInt8)(((xl) ) & 0xff); \
SAL_FALLTHROUGH; \
case 3: *(--(c)) = (sal_uInt8)(((xl) >> 8L) & 0xff); \
SAL_FALLTHROUGH; \
- case 2: *(--(c)) = (sal_uInt8)(((xl) >> 16L) & 0xff); \
+ case 2: *(--(c)) = (sal_uInt8)(((xl) >> 16) & 0xff); \
SAL_FALLTHROUGH; \
- case 1: *(--(c)) = (sal_uInt8)(((xl) >> 24L) & 0xff); \
+ case 1: *(--(c)) = (sal_uInt8)(((xl) >> 24) & 0xff); \
} \
}
diff --git a/sal/rtl/digest.cxx b/sal/rtl/digest.cxx
index 51cef8198037..e54ada89e5f2 100644
--- a/sal/rtl/digest.cxx
+++ b/sal/rtl/digest.cxx
@@ -34,16 +34,16 @@
#define RTL_DIGEST_ROTL(a,n) (((a) << (n)) | ((a) >> (32 - (n))))
#define RTL_DIGEST_HTONL(l,c) \
- (*((c)++) = (sal_uInt8)(((l) >> 24L) & 0xff), \
- *((c)++) = (sal_uInt8)(((l) >> 16L) & 0xff), \
+ (*((c)++) = (sal_uInt8)(((l) >> 24) & 0xff), \
+ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \
*((c)++) = (sal_uInt8)(((l) >> 8L) & 0xff), \
*((c)++) = (sal_uInt8)(((l) ) & 0xff))
#define RTL_DIGEST_LTOC(l,c) \
(*((c)++) = (sal_uInt8)(((l) ) & 0xff), \
*((c)++) = (sal_uInt8)(((l) >> 8L) & 0xff), \
- *((c)++) = (sal_uInt8)(((l) >> 16L) & 0xff), \
- *((c)++) = (sal_uInt8)(((l) >> 24L) & 0xff))
+ *((c)++) = (sal_uInt8)(((l) >> 16) & 0xff), \
+ *((c)++) = (sal_uInt8)(((l) >> 24) & 0xff))
typedef rtlDigestError (SAL_CALL Digest_init_t) (
void *ctx, const sal_uInt8 *Data, sal_uInt32 DatLen);
@@ -705,9 +705,9 @@ static void endMD5 (DigestContextMD5 *ctx)
SAL_FALLTHROUGH;
case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L;
SAL_FALLTHROUGH;
- case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
+ case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16;
SAL_FALLTHROUGH;
- case 3: X[i] |= ((sal_uInt32)(*p)) << 24L;
+ case 3: X[i] |= ((sal_uInt32)(*p)) << 24;
}
i += 1;
@@ -1159,9 +1159,9 @@ static void endSHA (DigestContextSHA *ctx)
SAL_FALLTHROUGH;
case 1: X[i] |= ((sal_uInt32)(*(p++))) << 8L;
SAL_FALLTHROUGH;
- case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16L;
+ case 2: X[i] |= ((sal_uInt32)(*(p++))) << 16;
SAL_FALLTHROUGH;
- case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24L;
+ case 3: X[i] |= ((sal_uInt32)(*(p++))) << 24;
}
swapLong (X, i + 1);
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 6eb1f70b5cdc..70efafafaaf0 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -84,7 +84,7 @@ namespace internal
// Costs about 17 cycles on a RISC machine with infinite
// instruction level parallelism (~42 basic
// instructions). Thus I truly doubt this pays off...
- return reinterpret_cast< ::std::size_t >(rKey.mxRef.get()) ^ (rKey.mnParagraphIndex << 16L);
+ return reinterpret_cast< ::std::size_t >(rKey.mxRef.get()) ^ (rKey.mnParagraphIndex << 16);
}
};
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 16df489d81a7..3eb47fbc867f 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -38,7 +38,7 @@
#define WATERMARK_LUM_OFFSET 50
#define WATERMARK_CON_OFFSET -70
-#define MAP( cVal0, cVal1, nFrac ) ((sal_uInt8)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L))
+#define MAP( cVal0, cVal1, nFrac ) ((sal_uInt8)((((long)(cVal0)<<20)+nFrac*((long)(cVal1)-(cVal0)))>>20))
GraphicManager::GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize ) :
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index cbe452b9223c..c3d78ef0eb7f 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -173,7 +173,7 @@ void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegio
int nR = comphelper::rng::uniform_int_distribution(0, 0x7F-1);
int nG = comphelper::rng::uniform_int_distribution(0, 0x7F-1);
int nB = comphelper::rng::uniform_int_distribution(0, 0x7F-1);
- const Color aColor(((((nR|0x80)<<8L)|(nG|0x80))<<8L)|(nB|0x80));
+ const Color aColor(((((nR|0x80)<<8)|(nG|0x80))<<8)|(nB|0x80));
mpOutputDevice->SetLineColor(aColor);
mpOutputDevice->SetFillColor();
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 314b4ba319c6..ee4743450126 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -364,9 +364,9 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
{
sal_uInt16 nLuminance((sal_uInt16)pReadAccess->GetLuminance(y, x) + 1);
const BitmapColor aDestColor(
- (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetRed()) >> 8L),
- (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetGreen()) >> 8L),
- (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetBlue()) >> 8L));
+ (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetRed()) >> 8),
+ (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetGreen()) >> 8),
+ (sal_uInt8)((nLuminance * (sal_uInt16)aShadowColor.GetBlue()) >> 8));
pWriteAccess->SetPixel(y, x, aDestColor);
}
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index a93e1eb3b973..b9663e078d4a 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2470,7 +2470,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
{
SdrModel* pModel = pPageObj->GetModel();
SdrPage* pNewPage = nullptr;
- const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1L) - 1L));
+ const sal_uInt16 nDestinationPageNum((sal_uInt16)((nPageNum << 1) - 1L));
if(pModel)
{
diff --git a/vcl/inc/impoctree.hxx b/vcl/inc/impoctree.hxx
index 0038ea6b6e31..fc63ade3c993 100644
--- a/vcl/inc/impoctree.hxx
+++ b/vcl/inc/impoctree.hxx
@@ -38,9 +38,9 @@ public:
}
ImpErrorQuad( const BitmapColor& rColor )
- : nRed( (long) rColor.GetRed() << 5L )
- , nGreen( (long) rColor.GetGreen() << 5L )
- , nBlue( (long) rColor.GetBlue() << 5L )
+ : nRed( (long) rColor.GetRed() << 5 )
+ , nGreen( (long) rColor.GetGreen() << 5 )
+ , nBlue( (long) rColor.GetBlue() << 5 )
{
}
@@ -57,53 +57,53 @@ public:
inline void ImpErrorQuad::operator=( const BitmapColor& rColor )
{
- nRed = (long) rColor.GetRed() << 5L;
- nGreen = (long) rColor.GetGreen() << 5L;
- nBlue = (long) rColor.GetBlue() << 5L;
+ nRed = (long) rColor.GetRed() << 5;
+ nGreen = (long) rColor.GetGreen() << 5;
+ nBlue = (long) rColor.GetBlue() << 5;
}
inline ImpErrorQuad& ImpErrorQuad::operator-=( const BitmapColor& rColor )
{
- nRed -= ( (long) rColor.GetRed() << 5L );
- nGreen -= ( (long) rColor.GetGreen() << 5L );
- nBlue -= ( (long) rColor.GetBlue() << 5L );
+ nRed -= ( (long) rColor.GetRed() << 5 );
+ nGreen -= ( (long) rColor.GetGreen() << 5 );
+ nBlue -= ( (long) rColor.GetBlue() << 5 );
return *this;
}
inline void ImpErrorQuad::ImplAddColorError1( const ImpErrorQuad& rErrQuad )
{
- nRed += ( rErrQuad.nRed >> 4L );
- nGreen += ( rErrQuad.nGreen >> 4L );
- nBlue += ( rErrQuad.nBlue >> 4L );
+ nRed += ( rErrQuad.nRed >> 4 );
+ nGreen += ( rErrQuad.nGreen >> 4 );
+ nBlue += ( rErrQuad.nBlue >> 4 );
}
inline void ImpErrorQuad::ImplAddColorError3( const ImpErrorQuad& rErrQuad )
{
- nRed += ( rErrQuad.nRed * 3L >> 4L );
- nGreen += ( rErrQuad.nGreen * 3L >> 4L );
- nBlue += ( rErrQuad.nBlue * 3L >> 4L );
+ nRed += ( rErrQuad.nRed * 3L >> 4 );
+ nGreen += ( rErrQuad.nGreen * 3L >> 4 );
+ nBlue += ( rErrQuad.nBlue * 3L >> 4 );
}
inline void ImpErrorQuad::ImplAddColorError5( const ImpErrorQuad& rErrQuad )
{
- nRed += ( rErrQuad.nRed * 5L >> 4L );
- nGreen += ( rErrQuad.nGreen * 5L >> 4L );
- nBlue += ( rErrQuad.nBlue * 5L >> 4L );
+ nRed += ( rErrQuad.nRed * 5L >> 4 );
+ nGreen += ( rErrQuad.nGreen * 5L >> 4 );
+ nBlue += ( rErrQuad.nBlue * 5L >> 4 );
}
inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad )
{
- nRed += ( rErrQuad.nRed * 7L >> 4L );
- nGreen += ( rErrQuad.nGreen * 7L >> 4L );
- nBlue += ( rErrQuad.nBlue *7L >> 4L );
+ nRed += ( rErrQuad.nRed * 7L >> 4 );
+ nGreen += ( rErrQuad.nGreen * 7L >> 4 );
+ nBlue += ( rErrQuad.nBlue *7L >> 4 );
}
inline BitmapColor ImpErrorQuad::ImplGetColor()
{
- return BitmapColor( (sal_uInt8) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ),
- (sal_uInt8) ( ( nGreen < 0L ? 0L : nGreen > 8160L ? 8160L : nGreen ) >> 5L ),
- (sal_uInt8) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) );
+ return BitmapColor( (sal_uInt8) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5 ),
+ (sal_uInt8) ( ( nGreen < 0L ? 0L : nGreen > 8160L ? 8160L : nGreen ) >> 5 ),
+ (sal_uInt8) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5 ) );
}
class ImpNodeCache
diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx b/vcl/source/bitmap/bitmapscalesuper.cxx
index ae540e5744e7..8008a56a8f29 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -26,7 +26,7 @@
namespace {
-#define MAP( cVal0, cVal1, nFrac ) ((sal_uInt8)((((long)(cVal0)<<7L)+nFrac*((long)(cVal1)-(cVal0)))>>7L))
+#define MAP( cVal0, cVal1, nFrac ) ((sal_uInt8)((((long)(cVal0)<<7)+nFrac*((long)(cVal1)-(cVal0)))>>7))
void generateMap(long nW, long nDstW, bool bHMirr, long* pMapIX, long* pMapFX)
{
@@ -286,7 +286,7 @@ void scaleNonPalleteGeneral(ScaleContext &rCtx, long nStartY, long nEndY)
void scalePallete8bit2(ScaleContext &rCtx, long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
- const long nMax = 1 << 7L;
+ const long nMax = 1 << 7;
for( long nY = nStartY; nY <= nEndY; nY++ )
{
@@ -342,10 +342,10 @@ void scalePallete8bit2(ScaleContext &rCtx, long nStartY, long nEndY)
if(nX == nEndX )
{
- nSumRowB += rCol.GetBlue() << 7L;
- nSumRowG += rCol.GetGreen() << 7L;
- nSumRowR += rCol.GetRed() << 7L;
- nTotalWeightX += 1 << 7L;
+ nSumRowB += rCol.GetBlue() << 7;
+ nSumRowG += rCol.GetGreen() << 7;
+ nSumRowR += rCol.GetRed() << 7;
+ nTotalWeightX += 1 << 7;
}
else if( j == 0 )
{
@@ -365,10 +365,10 @@ void scalePallete8bit2(ScaleContext &rCtx, long nStartY, long nEndY)
}
else
{
- nSumRowB += rCol.GetBlue() << 7L;
- nSumRowG += rCol.GetGreen() << 7L;
- nSumRowR += rCol.GetRed() << 7L;
- nTotalWeightX += 1 << 7L;
+ nSumRowB += rCol.GetBlue() << 7;
+ nSumRowG += rCol.GetGreen() << 7;
+ nSumRowR += rCol.GetRed() << 7;
+ nTotalWeightX += 1 << 7;
}
}
@@ -411,7 +411,7 @@ void scalePallete8bit2(ScaleContext &rCtx, long nStartY, long nEndY)
void scalePalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
- const long nMax = 1 << 7L;
+ const long nMax = 1 << 7;
for( long nY = nStartY; nY <= nEndY; nY++ )
{
@@ -466,10 +466,10 @@ void scalePalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY)
if(nX == nEndX )
{
- nSumRowB += aCol0.GetBlue() << 7L;
- nSumRowG += aCol0.GetGreen() << 7L;
- nSumRowR += aCol0.GetRed() << 7L;
- nTotalWeightX += 1 << 7L;
+ nSumRowB += aCol0.GetBlue() << 7;
+ nSumRowG += aCol0.GetGreen() << 7;
+ nSumRowR += aCol0.GetRed() << 7;
+ nTotalWeightX += 1 << 7;
}
else if( j == 0 )
{
@@ -492,10 +492,10 @@ void scalePalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY)
else
{
- nSumRowB += aCol0.GetBlue() << 7L;
- nSumRowG += aCol0.GetGreen() << 7L;
- nSumRowR += aCol0.GetRed() << 7L;
- nTotalWeightX += 1 << 7L;
+ nSumRowB += aCol0.GetBlue() << 7;
+ nSumRowG += aCol0.GetGreen() << 7;
+ nSumRowR += aCol0.GetRed() << 7;
+ nTotalWeightX += 1 << 7;
}
}
@@ -538,7 +538,7 @@ void scalePalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY)
void scale24bitBGR2(ScaleContext &rCtx, long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
- const long nMax = 1 << 7L;
+ const long nMax = 1 << 7;
for( long nY = nStartY; nY <= nEndY; nY++ )
{
@@ -594,10 +594,10 @@ void scale24bitBGR2(ScaleContext &rCtx, long nStartY, long nEndY)
{
if(nX == nEndX )
{
- nSumRowB += ( *pTmpX ) << 7L;pTmpX++;
- nSumRowG += ( *pTmpX ) << 7L;pTmpX++;
- nSumRowR += ( *pTmpX ) << 7L;pTmpX++;
- nTotalWeightX += 1 << 7L;
+ nSumRowB += ( *pTmpX ) << 7;pTmpX++;
+ nSumRowG += ( *pTmpX ) << 7;pTmpX++;
+ nSumRowR += ( *pTmpX ) << 7;pTmpX++;
+ nTotalWeightX += 1 << 7;
}
else if( j == 0 )
{
@@ -617,10 +617,10 @@ void scale24bitBGR2(ScaleContext &rCtx, long nStartY, long nEndY)
}
else
{
- nSumRowB += ( *pTmpX ) << 7L;pTmpX++;
- nSumRowG += ( *pTmpX ) << 7L;pTmpX++;
- nSumRowR += ( *pTmpX ) << 7L;pTmpX++;
- nTotalWeightX += 1 << 7L;
+ nSumRowB += ( *pTmpX ) << 7;pTmpX++;
+ nSumRowG += ( *pTmpX ) << 7;pTmpX++;
+ nSumRowR += ( *pTmpX ) << 7;pTmpX++;
+ nTotalWeightX += 1 << 7;
}
}
@@ -661,7 +661,7 @@ void scale24bitBGR2(ScaleContext &rCtx, long nStartY, long nEndY)
void scale24bitRGB2(ScaleContext &rCtx, long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
- const long nMax = 1 << 7L;
+ const long nMax = 1 << 7;
for( long nY = nStartY; nY <= nEndY; nY++ )
{
@@ -715,10 +715,10 @@ void scale24bitRGB2(ScaleContext &rCtx, long nStartY, long nEndY)
{
if(nX == nEndX )
{
- nSumRowR += ( *pTmpX ) << 7L;pTmpX++;
- nSumRowG += ( *pTmpX ) << 7L;pTmpX++;
- nSumRowB += ( *pTmpX ) << 7L;pTmpX++;
- nTotalWeightX += 1 << 7L;
+ nSumRowR += ( *pTmpX ) << 7;pTmpX++;
+ nSumRowG += ( *pTmpX ) << 7;pTmpX++;
+ nSumRowB += ( *pTmpX ) << 7;pTmpX++;
+ nTotalWeightX += 1 << 7;
}
else if( j == 0 )
{
@@ -738,10 +738,10 @@ void scale24bitRGB2(ScaleContext &rCtx, long nStartY, long nEndY)
}
else
{
- nSumRowR += ( *pTmpX ) << 7L;pTmpX++;
- nSumRowG += ( *pTmpX ) << 7L;pTmpX++;
- nSumRowB += ( *pTmpX ) << 7L;pTmpX++;
- nTotalWeightX += 1 << 7L;
+ nSumRowR += ( *pTmpX ) << 7;pTmpX++;
+ nSumRowG += ( *pTmpX ) << 7;pTmpX++;
+ nSumRowB += ( *pTmpX ) << 7;pTmpX++;
+ nTotalWeightX += 1 << 7;
}
}
@@ -782,7 +782,7 @@ void scale24bitRGB2(ScaleContext &rCtx, long nStartY, long nEndY)
void scaleNonPalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
- const long nMax = 1 << 7L;
+ const long nMax = 1 << 7;
for( long nY = nStartY; nY <= nEndY; nY++ )
{
@@ -837,10 +837,10 @@ void scaleNonPalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY)
if(nX == nEndX )
{
- nSumRowB += aCol0.GetBlue() << 7L;
- nSumRowG += aCol0.GetGreen() << 7L;
- nSumRowR += aCol0.GetRed() << 7L;
- nTotalWeightX += 1 << 7L;
+ nSumRowB += aCol0.GetBlue() << 7;
+ nSumRowG += aCol0.GetGreen() << 7;
+ nSumRowR += aCol0.GetRed() << 7;
+ nTotalWeightX += 1 << 7;
}
else if( j == 0 )
{
@@ -862,10 +862,10 @@ void scaleNonPalleteGeneral2(ScaleContext &rCtx, long nStartY, long nEndY)
}
else
{
- nSumRowB += aCol0.GetBlue() << 7L;
- nSumRowG += aCol0.GetGreen() << 7L;
- nSumRowR += aCol0.GetRed() << 7L;
- nTotalWeightX += 1 << 7L;
+ nSumRowB += aCol0.GetBlue() << 7;
+ nSumRowG += aCol0.GetGreen() << 7;
+ nSumRowR += aCol0.GetRed() << 7;
+ nTotalWeightX += 1 << 7;
}
}
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 272c0e0f9a17..01dd7b42c784 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -514,7 +514,7 @@ bool Bitmap::Mirror( BmpMirrorFlags nMirrorFlags )
const long nWidth = pAcc->Width();
const long nHeight = pAcc->Height();
const long nWidth1 = nWidth - 1L;
- const long nWidth_2 = nWidth >> 1L;
+ const long nWidth_2 = nWidth >> 1;
for( long nY = 0L; nY < nHeight; nY++ )
{
@@ -541,7 +541,7 @@ bool Bitmap::Mirror( BmpMirrorFlags nMirrorFlags )
std::unique_ptr<sal_uInt8[]> pBuffer(new sal_uInt8[ nScanSize ]);
const long nHeight = pAcc->Height();
const long nHeight1 = nHeight - 1L;
- const long nHeight_2 = nHeight >> 1L;
+ const long nHeight_2 = nHeight >> 1;
for( long nY = 0L, nOther = nHeight1; nY < nHeight_2; nY++, nOther-- )
{
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index f0608a0b31af..b0d2843639b2 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -1344,13 +1344,13 @@ bool Bitmap::ImplDitherMatrix()
{
for( sal_uLong nY = 0UL; nY < nHeight; nY++ )
{
- for( sal_uLong nX = 0UL, nModY = ( nY & 0x0FUL ) << 4UL; nX < nWidth; nX++ )
+ for( sal_uLong nX = 0UL, nModY = ( nY & 0x0FUL ) << 4; nX < nWidth; nX++ )
{
const BitmapColor aCol( pReadAcc->GetPaletteColor( pReadAcc->GetPixelIndex( nY, nX ) ) );
const sal_uLong nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ];
- const sal_uLong nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL;
- const sal_uLong nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL;
- const sal_uLong nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL;
+ const sal_uLong nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16;
+ const sal_uLong nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16;
+ const sal_uLong nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16;
aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ nR ] + nVCLGLut[ nG ] + nVCLBLut[ nB ] ) );
pWriteAcc->SetPixel( nY, nX, aIndex );
@@ -1361,13 +1361,13 @@ bool Bitmap::ImplDitherMatrix()
{
for( sal_uLong nY = 0UL; nY < nHeight; nY++ )
{
- for( sal_uLong nX = 0UL, nModY = ( nY & 0x0FUL ) << 4UL; nX < nWidth; nX++ )
+ for( sal_uLong nX = 0UL, nModY = ( nY & 0x0FUL ) << 4; nX < nWidth; nX++ )
{
const BitmapColor aCol( pReadAcc->GetPixel( nY, nX ) );
const sal_uLong nD = nVCLDitherLut[ nModY + ( nX & 0x0FUL ) ];
- const sal_uLong nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16UL;
- const sal_uLong nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16UL;
- const sal_uLong nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16UL;
+ const sal_uLong nR = ( nVCLLut[ aCol.GetRed() ] + nD ) >> 16;
+ const sal_uLong nG = ( nVCLLut[ aCol.GetGreen() ] + nD ) >> 16;
+ const sal_uLong nB = ( nVCLLut[ aCol.GetBlue() ] + nD ) >> 16;
aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ nR ] + nVCLGLut[ nG ] + nVCLBLut[ nB ] ) );
pWriteAcc->SetPixel( nY, nX, aIndex );
diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx
index ea02ab7598b6..7e3821ab5be0 100644
--- a/vcl/source/gdi/bmpacc2.cxx
+++ b/vcl/source/gdi/bmpacc2.cxx
@@ -102,25 +102,25 @@ void BitmapReadAccess::SetPixelForN8BitTcMask(Scanline pScanline, long nX, const
BitmapColor BitmapReadAccess::GetPixelForN16BitTcMsbMask(ConstScanline pScanline, long nX, const ColorMask& rMask)
{
BitmapColor aColor;
- rMask.GetColorFor16BitMSB( aColor, pScanline + ( nX << 1UL ) );
+ rMask.GetColorFor16BitMSB( aColor, pScanline + ( nX << 1 ) );
return aColor;
}
void BitmapReadAccess::SetPixelForN16BitTcMsbMask(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask)
{
- rMask.SetColorFor16BitMSB( rBitmapColor, pScanline + ( nX << 1UL ) );
+ rMask.SetColorFor16BitMSB( rBitmapColor, pScanline + ( nX << 1 ) );
}
BitmapColor BitmapReadAccess::GetPixelForN16BitTcLsbMask(ConstScanline pScanline, long nX, const ColorMask& rMask)
{
BitmapColor aColor;
- rMask.GetColorFor16BitLSB( aColor, pScanline + ( nX << 1UL ) );
+ rMask.GetColorFor16BitLSB( aColor, pScanline + ( nX << 1 ) );
return aColor;
}
void BitmapReadAccess::SetPixelForN16BitTcLsbMask(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask)
{
- rMask.SetColorFor16BitLSB( rBitmapColor, pScanline + ( nX << 1UL ) );
+ rMask.SetColorFor16BitLSB( rBitmapColor, pScanline + ( nX << 1 ) );
}
BitmapColor BitmapReadAccess::GetPixelForN24BitTcBgr(ConstScanline pScanline, long nX, const ColorMask&)
@@ -262,13 +262,13 @@ void BitmapReadAccess::SetPixelForN32BitTcRgba(Scanline pScanline, long nX, cons
BitmapColor BitmapReadAccess::GetPixelForN32BitTcMask(ConstScanline pScanline, long nX, const ColorMask& rMask)
{
BitmapColor aColor;
- rMask.GetColorFor32Bit( aColor, pScanline + ( nX << 2UL ) );
+ rMask.GetColorFor32Bit( aColor, pScanline + ( nX << 2 ) );
return aColor;
}
void BitmapReadAccess::SetPixelForN32BitTcMask(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask)
{
- rMask.SetColorFor32Bit( rBitmapColor, pScanline + ( nX << 2UL ) );
+ rMask.SetColorFor32Bit( rBitmapColor, pScanline + ( nX << 2 ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 9d0fadb741bf..bd88eb9d5725 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -615,7 +615,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
cTmp = *pTmp++;
}
- auto nIndex = (cTmp >> ( --nShift << 2UL ) ) & 0x0f;
+ auto nIndex = (cTmp >> ( --nShift << 2 ) ) & 0x0f;
rAcc.SetPixelIndex(nY, nX, SanitizePaletteIndex(nIndex, rPalette, bForceToMonoWhileReading));
}
}
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 0b7957c6f0a7..73cbe2d1f437 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -301,7 +301,7 @@ void ImplChain::ImplGetSpace()
const sal_uLong nOldArraySize = mnArraySize;
sal_uInt8* pNewCodes;
- mnArraySize = mnArraySize << 1UL;
+ mnArraySize = mnArraySize << 1;
pNewCodes = new sal_uInt8[ mnArraySize ];
memcpy( pNewCodes, mpCodes.get(), nOldArraySize );
mpCodes.reset( pNewCodes );
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 618217c05fd4..3e538d13e1b6 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1425,7 +1425,7 @@ Bitmap OutputDevice::BlendBitmapWithAlpha(
for( nY = 0, nOutY = nOffY; nY < nDstHeight; nY++, nOutY++ )
{
const long nMapY = pMapY[ nY ];
- const long nModY = ( nOutY & 0x0FL ) << 4L;
+ const long nModY = ( nOutY & 0x0FL ) << 4;
int nOutX;
for( nX = 0, nOutX = nOffX; nX < nDstWidth; nX++, nOutX++ )
@@ -1435,14 +1435,14 @@ Bitmap OutputDevice::BlendBitmapWithAlpha(
aDstCol = AlphaBlend( nX, nY, nMapX, nMapY, pP, pA, pB.get(), pAlphaW.get(), nResAlpha );
- aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16UL ] +
- nVCLGLut[ ( nVCLLut[ aDstCol.GetGreen() ] + nD ) >> 16UL ] +
- nVCLBLut[ ( nVCLLut[ aDstCol.GetBlue() ] + nD ) >> 16UL ] ) );
+ aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16 ] +
+ nVCLGLut[ ( nVCLLut[ aDstCol.GetGreen() ] + nD ) >> 16 ] +
+ nVCLBLut[ ( nVCLLut[ aDstCol.GetBlue() ] + nD ) >> 16 ] ) );
pW->SetPixel( nY, nX, aIndex );
- aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ 255-nResAlpha ] + nD ) >> 16UL ] +
- nVCLGLut[ ( nVCLLut[ 255-nResAlpha ] + nD ) >> 16UL ] +
- nVCLBLut[ ( nVCLLut[ 255-nResAlpha ] + nD ) >> 16UL ] ) );
+ aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ 255-nResAlpha ] + nD ) >> 16 ] +
+ nVCLGLut[ ( nVCLLut[ 255-nResAlpha ] + nD ) >> 16 ] +
+ nVCLBLut[ ( nVCLLut[ 255-nResAlpha ] + nD ) >> 16 ] ) );
pAlphaW->SetPixel( nY, nX, aIndex );
}
}
@@ -1518,7 +1518,7 @@ Bitmap OutputDevice::BlendBitmap(
{
nMapY = aBmpRect.Bottom() - nMapY;
}
- const long nModY = ( nOutY & 0x0FL ) << 4L;
+ const long nModY = ( nOutY & 0x0FL ) << 4;
int nOutX;
for( nX = 0, nOutX = nOffX; nX < nDstWidth; nX++, nOutX++ )
@@ -1532,9 +1532,9 @@ Bitmap OutputDevice::BlendBitmap(
aDstCol = pB->GetColor( nY, nX );
aDstCol.Merge( pP->GetColor( nMapY, nMapX ), pA->GetPixelIndex( nMapY, nMapX ) );
- aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16UL ] +
- nVCLGLut[ ( nVCLLut[ aDstCol.GetGreen() ] + nD ) >> 16UL ] +
- nVCLBLut[ ( nVCLLut[ aDstCol.GetBlue() ] + nD ) >> 16UL ] ) );
+ aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[ aDstCol.GetRed() ] + nD ) >> 16 ] +
+ nVCLGLut[ ( nVCLLut[ aDstCol.GetGreen() ] + nD ) >> 16 ] +
+ nVCLBLut[ ( nVCLLut[ aDstCol.GetBlue() ] + nD ) >> 16 ] ) );
pW->SetPixel( nY, nX, aIndex );
}
}
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index 8b95249da6d8..07378386a0f6 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -982,7 +982,7 @@ void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf,
{
if( bRLE4 )
{
- nCountByte = nRunByte >> 1UL;
+ nCountByte = nRunByte >> 1;
for( i = 0; i < nCountByte; i++ )
{
commit 0b50531a401f405edd9f1c889512171d3273169a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 17 16:10:42 2017 +0100
move the exception handling
Change-Id: Ie61a424a78be85c1dc54dd56451319356227f443
(cherry picked from commit ce0e70fdd643b88b70cbcfa55847f0285116273a)
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index a7c9278409d0..d50453192f8a 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -943,43 +943,56 @@ bool GraphicObject::SwapOut()
bool GraphicObject::SwapOut( SvStream* pOStm )
{
- bool bRet = !mbAutoSwapped;
- // swap out as a link
- if( pOStm == GRFMGR_AUTOSWAPSTREAM_LINK )
+ bool bRet = false;
+ try
{
- maGraphic.SwapOutAsLink();
+ bRet = !mbAutoSwapped;
+ // swap out as a link
+ if( pOStm == GRFMGR_AUTOSWAPSTREAM_LINK )
+ {
+ maGraphic.SwapOutAsLink();
+ }
+ else
+ {
+ bRet = bRet && maGraphic.SwapOut( pOStm );
+ }
+
+ if (bRet)
+ mpGlobalMgr->ImplGraphicObjectWasSwappedOut(*this);
}
- else
+ catch(...)
{
- bRet = bRet && maGraphic.SwapOut( pOStm );
+ SAL_WARN( "svtools", "GraphicObject::SwapIn exception");
}
-
- if (bRet)
- mpGlobalMgr->ImplGraphicObjectWasSwappedOut(*this);
-
return bRet;
}
bool GraphicObject::SwapIn()
{
bool bRet = false;
-
- if( mbAutoSwapped )
+ try
{
- ImplAutoSwapIn();
- bRet = true;
- }
- else
- {
- bRet = maGraphic.SwapIn();
+ if( mbAutoSwapped )
+ {
+ ImplAutoSwapIn();
+ bRet = true;
+ }
+ else
+ {
+ bRet = maGraphic.SwapIn();
- if (bRet)
- mpGlobalMgr->ImplGraphicObjectWasSwappedIn(*this);
- }
+ if (bRet)
+ mpGlobalMgr->ImplGraphicObjectWasSwappedIn(*this);
+ }
- if( bRet )
+ if( bRet )
+ {
+ ImplAssignGraphicData();
+ }
+ }
+ catch (...)
{
- ImplAssignGraphicData();
+ SAL_WARN( "svtools", "GraphicObject::SwapIn exception");
}
return bRet;
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 5fdf63b77724..9d0fadb741bf 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -1389,192 +1389,185 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess*
bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream& rOStm, BitmapReadAccess& rAcc, BitmapReadAccess* pAccAlpha, bool bCompressed)
{
- try
+ const MapMode aMapPixel(MapUnit::MapPixel);
+ DIBV5Header aHeader;
+ sal_uLong nImageSizePos(0);
+ sal_uLong nEndPos(0);
+ sal_uInt32 nCompression(COMPRESS_NONE);
+ bool bRet(false);
+
+ aHeader.nSize = pAccAlpha ? DIBV5HEADERSIZE : DIBINFOHEADERSIZE; // size dependent on CF_DIB type to use
+ aHeader.nWidth = rAcc.Width();
+ aHeader.nHeight = rAcc.Height();
+ aHeader.nPlanes = 1;
+
+ if(!pAccAlpha && isBitfieldCompression(rAcc.GetScanlineFormat()))
{
- const MapMode aMapPixel(MapUnit::MapPixel);
- DIBV5Header aHeader;
- sal_uLong nImageSizePos(0);
- sal_uLong nEndPos(0);
- sal_uInt32 nCompression(COMPRESS_NONE);
- bool bRet(false);
-
- aHeader.nSize = pAccAlpha ? DIBV5HEADERSIZE : DIBINFOHEADERSIZE; // size dependent on CF_DIB type to use
- aHeader.nWidth = rAcc.Width();
- aHeader.nHeight = rAcc.Height();
- aHeader.nPlanes = 1;
-
- if(!pAccAlpha && isBitfieldCompression(rAcc.GetScanlineFormat()))
- {
- aHeader.nBitCount = (ScanlineFormat::N16BitTcLsbMask == rAcc.GetScanlineFormat()) ? 16 : 32;
- aHeader.nSizeImage = rAcc.Height() * rAcc.GetScanlineSize();
- nCompression = BITFIELDS;
- }
- else
+ aHeader.nBitCount = (ScanlineFormat::N16BitTcLsbMask == rAcc.GetScanlineFormat()) ? 16 : 32;
+ aHeader.nSizeImage = rAcc.Height() * rAcc.GetScanlineSize();
+ nCompression = BITFIELDS;
+ }
+ else
+ {
+ // #i5xxx# Limit bitcount to 24bit, the 32 bit cases are
+ // not handled properly below (would have to set color
+ // masks, and nCompression=BITFIELDS - but color mask is
+ // not set for formats != *_TC_*). Note that this very
+ // problem might cause trouble at other places - the
+ // introduction of 32 bit RGBA bitmaps is relatively
+ // recent.
+ // #i59239# discretize bitcount to 1,4,8,24 (other cases
+ // are not written below)
+ const sal_uInt16 nBitCount(pAccAlpha ? 32 : discretizeBitcount(rAcc.GetBitCount()));
+ aHeader.nBitCount = nBitCount;
+ aHeader.nSizeImage = rAcc.Height() * AlignedWidth4Bytes(rAcc.Width() * aHeader.nBitCount);
+
+ if(bCompressed)
{
- // #i5xxx# Limit bitcount to 24bit, the 32 bit cases are
- // not handled properly below (would have to set color
- // masks, and nCompression=BITFIELDS - but color mask is
- // not set for formats != *_TC_*). Note that this very
- // problem might cause trouble at other places - the
- // introduction of 32 bit RGBA bitmaps is relatively
- // recent.
- // #i59239# discretize bitcount to 1,4,8,24 (other cases
- // are not written below)
- const sal_uInt16 nBitCount(pAccAlpha ? 32 : discretizeBitcount(rAcc.GetBitCount()));
- aHeader.nBitCount = nBitCount;
- aHeader.nSizeImage = rAcc.Height() * AlignedWidth4Bytes(rAcc.Width() * aHeader.nBitCount);
-
- if(bCompressed)
+ if(4 == nBitCount)
{
- if(4 == nBitCount)
- {
- nCompression = RLE_4;
- }
- else if(8 == nBitCount)
- {
- nCompression = RLE_8;
- }
+ nCompression = RLE_4;
+ }
+ else if(8 == nBitCount)
+ {
+ nCompression = RLE_8;
}
}
+ }
- if((rOStm.GetCompressMode() & SvStreamCompressFlags::ZBITMAP) && (rOStm.GetVersion() >= SOFFICE_FILEFORMAT_40))
- {
- aHeader.nCompression = ZCOMPRESS;
- }
- else
- {
- aHeader.nCompression = nCompression;
- }
+ if((rOStm.GetCompressMode() & SvStreamCompressFlags::ZBITMAP) && (rOStm.GetVersion() >= SOFFICE_FILEFORMAT_40))
+ {
+ aHeader.nCompression = ZCOMPRESS;
+ }
+ else
+ {
+ aHeader.nCompression = nCompression;
+ }
- if(rBitmap.GetPrefSize().Width() && rBitmap.GetPrefSize().Height() && (rBitmap.GetPrefMapMode() != aMapPixel))
+ if(rBitmap.GetPrefSize().Width() && rBitmap.GetPrefSize().Height() && (rBitmap.GetPrefMapMode() != aMapPixel))
+ {
+ // #i48108# Try to recover xpels/ypels as previously stored on
+ // disk. The problem with just converting maPrefSize to 100th
+ // mm and then relating that to the bitmap pixel size is that
+ // MapMode is integer-based, and suffers from roundoffs,
+ // especially if maPrefSize is small. Trying to circumvent
+ // that by performing part of the math in floating point.
+ const Size aScale100000(OutputDevice::LogicToLogic(Size(100000, 100000), MapUnit::Map100thMM, rBitmap.GetPrefMapMode()));
+ const double fBmpWidthM((double)rBitmap.GetPrefSize().Width() / aScale100000.Width());
+ const double fBmpHeightM((double)rBitmap.GetPrefSize().Height() / aScale100000.Height());
+
+ if(!basegfx::fTools::equalZero(fBmpWidthM) && !basegfx::fTools::equalZero(fBmpHeightM))
{
- // #i48108# Try to recover xpels/ypels as previously stored on
- // disk. The problem with just converting maPrefSize to 100th
- // mm and then relating that to the bitmap pixel size is that
- // MapMode is integer-based, and suffers from roundoffs,
- // especially if maPrefSize is small. Trying to circumvent
- // that by performing part of the math in floating point.
- const Size aScale100000(OutputDevice::LogicToLogic(Size(100000, 100000), MapUnit::Map100thMM, rBitmap.GetPrefMapMode()));
- const double fBmpWidthM((double)rBitmap.GetPrefSize().Width() / aScale100000.Width());
- const double fBmpHeightM((double)rBitmap.GetPrefSize().Height() / aScale100000.Height());
-
- if(!basegfx::fTools::equalZero(fBmpWidthM) && !basegfx::fTools::equalZero(fBmpHeightM))
- {
- aHeader.nXPelsPerMeter = basegfx::fround(rAcc.Width() / fabs(fBmpWidthM));
- aHeader.nYPelsPerMeter = basegfx::fround(rAcc.Height() / fabs(fBmpHeightM));
- }
+ aHeader.nXPelsPerMeter = basegfx::fround(rAcc.Width() / fabs(fBmpWidthM));
+ aHeader.nYPelsPerMeter = basegfx::fround(rAcc.Height() / fabs(fBmpHeightM));
}
+ }
- aHeader.nColsUsed = ((!pAccAlpha && aHeader.nBitCount <= 8) ? rAcc.GetPaletteEntryCount() : 0);
- aHeader.nColsImportant = 0;
+ aHeader.nColsUsed = ((!pAccAlpha && aHeader.nBitCount <= 8) ? rAcc.GetPaletteEntryCount() : 0);
+ aHeader.nColsImportant = 0;
- rOStm.WriteUInt32( aHeader.nSize );
- rOStm.WriteInt32( aHeader.nWidth );
- rOStm.WriteInt32( aHeader.nHeight );
- rOStm.WriteUInt16( aHeader.nPlanes );
- rOStm.WriteUInt16( aHeader.nBitCount );
- rOStm.WriteUInt32( aHeader.nCompression );
+ rOStm.WriteUInt32( aHeader.nSize );
+ rOStm.WriteInt32( aHeader.nWidth );
+ rOStm.WriteInt32( aHeader.nHeight );
+ rOStm.WriteUInt16( aHeader.nPlanes );
+ rOStm.WriteUInt16( aHeader.nBitCount );
+ rOStm.WriteUInt32( aHeader.nCompression );
- nImageSizePos = rOStm.Tell();
- rOStm.SeekRel( sizeof( aHeader.nSizeImage ) );
+ nImageSizePos = rOStm.Tell();
+ rOStm.SeekRel( sizeof( aHeader.nSizeImage ) );
- rOStm.WriteInt32( aHeader.nXPelsPerMeter );
- rOStm.WriteInt32( aHeader.nYPelsPerMeter );
- rOStm.WriteUInt32( aHeader.nColsUsed );
- rOStm.WriteUInt32( aHeader.nColsImportant );
+ rOStm.WriteInt32( aHeader.nXPelsPerMeter );
+ rOStm.WriteInt32( aHeader.nYPelsPerMeter );
+ rOStm.WriteUInt32( aHeader.nColsUsed );
+ rOStm.WriteUInt32( aHeader.nColsImportant );
- if(pAccAlpha) // only write DIBV5 when asked to do so
- {
- aHeader.nV5CSType = 0x57696E20; // LCS_WINDOWS_COLOR_SPACE
- aHeader.nV5Intent = 0x00000004; // LCS_GM_IMAGES
-
- rOStm.WriteUInt32( aHeader.nV5RedMask );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list