[Libreoffice-commits] core.git: 69 commits - accessibility/source avmedia/source basctl/source basic/qa basic/source canvas/source chart2/inc chart2/source comphelper/source compilerplugins/clang connectivity/source cppcanvas/source cppuhelper/source cppu/source cui/source dbaccess/source desktop/source editeng/source embeddedobj/source eventattacher/source extensions/source filter/source forms/source formula/source framework/source helpcompiler/source hwpfilter/source i18npool/inc i18npool/source include/com include/cppu include/osl include/svtools include/tools include/ucbhelper include/vcl io/source jvmfwk/source l10ntools/source libreofficekit/source lingucomponent/source linguistic/source lotuswordpro/source mysqlc/source o3tl/qa oox/source opencl/source package/source pyuno/source reportdesign/source rsc/inc rsc/source sal/osl sal/qa sal/rtl sal/textenc sax/source scaddins/source sc/inc scripting/source sc/source sdext/source sd/source sfx2/source sot/qa sot/source starmath/source stoc/sour ce store/source svl/source svtools/source svx/source sw/inc sw/source testtools/source toolkit/source tools/source ucb/source UnoControls/inc UnoControls/source unotools/source vcl/generic vcl/headless vcl/osx vcl/qa vcl/quartz vcl/source vcl/unx vcl/workben writerperfect/source xmlhelp/source xmloff/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Mon Jun 8 07:31:21 PDT 2015
UnoControls/inc/multiplexer.hxx | 2
UnoControls/source/base/basecontainercontrol.cxx | 4
UnoControls/source/base/basecontrol.cxx | 6
UnoControls/source/controls/OConnectionPointContainerHelper.cxx | 2
UnoControls/source/controls/framecontrol.cxx | 6
accessibility/source/extended/accessiblelistbox.cxx | 2
accessibility/source/helper/acc_factory.cxx | 8
avmedia/source/macavf/framegrabber.mm | 2
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 2
basctl/source/basicide/baside2b.cxx | 4
basctl/source/basicide/baside3.cxx | 2
basctl/source/dlged/dlgedfunc.cxx | 6
basctl/source/dlged/dlgedobj.cxx | 2
basic/qa/cppunit/basictest.hxx | 2
basic/source/basmgr/basmgr.cxx | 16 -
basic/source/classes/eventatt.cxx | 10
basic/source/classes/propacc.cxx | 4
basic/source/classes/sb.cxx | 2
basic/source/classes/sbunoobj.cxx | 114 +++++-----
basic/source/classes/sbxmod.cxx | 6
basic/source/comp/exprtree.cxx | 2
basic/source/comp/parser.cxx | 2
basic/source/runtime/ddectrl.cxx | 2
basic/source/runtime/methods.cxx | 2
basic/source/runtime/runtime.cxx | 26 +-
basic/source/sbx/sbxarray.cxx | 4
basic/source/sbx/sbxexec.cxx | 2
basic/source/sbx/sbxobj.cxx | 4
basic/source/sbx/sbxvalue.cxx | 4
basic/source/uno/namecont.cxx | 6
basic/source/uno/scriptcont.cxx | 2
canvas/source/cairo/cairo_canvasbitmap.cxx | 2
canvas/source/vcl/canvasbitmaphelper.cxx | 8
canvas/source/vcl/canvashelper_texturefill.cxx | 2
canvas/source/vcl/impltools.cxx | 2
chart2/inc/ChartModel.hxx | 2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 2
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 6
chart2/source/controller/inc/ChartDocumentWrapper.hxx | 2
chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx | 2
chart2/source/controller/main/ChartController.hxx | 2
chart2/source/controller/main/ChartFrameloader.hxx | 2
chart2/source/controller/main/ElementSelector.hxx | 2
chart2/source/inc/CachedDataSequence.hxx | 2
chart2/source/inc/ConfigColorScheme.hxx | 2
chart2/source/inc/DataSource.hxx | 2
chart2/source/inc/ErrorBar.hxx | 2
chart2/source/inc/InternalDataProvider.hxx | 2
chart2/source/inc/LabeledDataSequence.hxx | 2
chart2/source/inc/Scaling.hxx | 8
chart2/source/model/inc/CartesianCoordinateSystem.hxx | 4
chart2/source/model/inc/ChartTypeManager.hxx | 2
chart2/source/model/inc/DataSeries.hxx | 2
chart2/source/model/inc/Diagram.hxx | 2
chart2/source/model/inc/PolarCoordinateSystem.hxx | 4
chart2/source/model/inc/XMLFilter.hxx | 4
chart2/source/model/main/Axis.hxx | 2
chart2/source/model/main/FormattedString.hxx | 2
chart2/source/model/main/GridProperties.hxx | 2
chart2/source/model/main/Legend.hxx | 2
chart2/source/model/main/PageBackground.hxx | 2
chart2/source/model/main/Title.hxx | 2
chart2/source/model/template/AreaChartType.hxx | 2
chart2/source/model/template/BarChartType.hxx | 2
chart2/source/model/template/BubbleChartType.hxx | 2
chart2/source/model/template/CandleStickChartType.hxx | 2
chart2/source/model/template/ColumnChartType.hxx | 2
chart2/source/model/template/FilledNetChartType.hxx | 2
chart2/source/model/template/GL3DBarChartType.hxx | 2
chart2/source/model/template/LineChartType.hxx | 2
chart2/source/model/template/NetChartType.hxx | 2
chart2/source/model/template/PieChartType.hxx | 2
chart2/source/model/template/ScatterChartType.hxx | 2
chart2/source/tools/RegressionCurveModel.hxx | 14 -
chart2/source/tools/RegressionEquation.hxx | 2
chart2/source/view/inc/GL3DRenderer.hxx | 2
chart2/source/view/main/GL3DRenderer.cxx | 26 +-
chart2/source/view/main/OpenGLRender.cxx | 24 +-
comphelper/source/compare/AnyCompareFactory.cxx | 2
comphelper/source/container/IndexedPropertyValuesContainer.cxx | 2
comphelper/source/container/NamedPropertyValuesContainer.cxx | 2
comphelper/source/container/namecontainer.cxx | 2
comphelper/source/eventattachermgr/eventattachermgr.cxx | 4
comphelper/source/property/genericpropertyset.cxx | 2
comphelper/source/streaming/memorystream.cxx | 4
comphelper/source/streaming/oslfile2streamwrap.cxx | 2
compilerplugins/clang/cstylecast.cxx | 8
connectivity/source/commontools/TSortIndex.cxx | 2
connectivity/source/commontools/dbexception.cxx | 2
connectivity/source/drivers/evoab2/NConnection.cxx | 2
connectivity/source/drivers/evoab2/NResultSet.cxx | 2
connectivity/source/drivers/evoab2/NResultSet.hxx | 2
connectivity/source/drivers/evoab2/NStatement.cxx | 2
connectivity/source/drivers/file/FConnection.cxx | 2
connectivity/source/drivers/firebird/Connection.cxx | 2
connectivity/source/drivers/firebird/ResultSet.hxx | 2
connectivity/source/drivers/jdbc/JBigDecimal.cxx | 4
connectivity/source/drivers/jdbc/JConnection.cxx | 2
connectivity/source/drivers/jdbc/JStatement.cxx | 2
connectivity/source/drivers/jdbc/Timestamp.cxx | 6
connectivity/source/drivers/jdbc/tools.cxx | 2
connectivity/source/drivers/kab/KResultSet.hxx | 2
connectivity/source/drivers/macab/MacabConnection.cxx | 2
connectivity/source/drivers/macab/MacabResultSet.hxx | 2
connectivity/source/drivers/mork/MConnection.cxx | 2
connectivity/source/drivers/mork/MResultSet.hxx | 2
connectivity/source/drivers/mork/MStatement.cxx | 2
connectivity/source/drivers/odbc/OConnection.cxx | 2
connectivity/source/drivers/odbc/OResultSet.cxx | 10
connectivity/source/drivers/odbc/OResultSetMetaData.cxx | 4
connectivity/source/drivers/odbc/OTools.cxx | 8
connectivity/source/inc/file/FResultSet.hxx | 2
connectivity/source/inc/file/FStatement.hxx | 2
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 2
connectivity/source/inc/odbc/OResultSet.hxx | 2
connectivity/source/inc/odbc/OStatement.hxx | 2
cppcanvas/source/mtfrenderer/emfplus.cxx | 2
cppcanvas/source/mtfrenderer/implrenderer.cxx | 4
cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx | 2
cppu/source/threadpool/threadpool.cxx | 4
cppu/source/typelib/typelib.cxx | 6
cppu/source/uno/lbenv.cxx | 4
cppuhelper/source/component.cxx | 4
cppuhelper/source/propshlp.cxx | 4
cppuhelper/source/weak.cxx | 8
cui/source/customize/eventdlg.cxx | 2
cui/source/customize/macropg.cxx | 2
cui/source/dialogs/cuicharmap.cxx | 2
cui/source/dialogs/hlmarkwn.cxx | 6
cui/source/dialogs/hltpbase.cxx | 2
cui/source/dialogs/iconcdlg.cxx | 2
cui/source/dialogs/linkdlg.cxx | 2
cui/source/factory/dlgfact.cxx | 10
cui/source/inc/hltpbase.hxx | 6
cui/source/options/fontsubs.cxx | 2
cui/source/options/optfltr.cxx | 2
cui/source/options/optgdlg.cxx | 6
cui/source/options/optlingu.cxx | 20 -
cui/source/options/optsave.cxx | 2
cui/source/tabpages/autocdlg.cxx | 6
dbaccess/source/core/api/KeySet.cxx | 4
dbaccess/source/core/api/OptimisticSet.cxx | 2
dbaccess/source/core/dataaccess/intercept.cxx | 4
dbaccess/source/inc/apitools.hxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 22 -
dbaccess/source/ui/browser/exsrcbrw.cxx | 12 -
dbaccess/source/ui/browser/formadapter.cxx | 18 -
dbaccess/source/ui/browser/genericcontroller.cxx | 2
dbaccess/source/ui/browser/sbagrid.cxx | 8
dbaccess/source/ui/browser/unodatbr.cxx | 8
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 2
dbaccess/source/ui/dlg/sqlmessage.cxx | 4
dbaccess/source/ui/misc/TableCopyHelper.cxx | 2
dbaccess/source/ui/misc/TokenWriter.cxx | 6
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4
desktop/source/migration/services/wordbookmigration.cxx | 2
desktop/source/splash/unxsplash.cxx | 2
editeng/source/accessibility/AccessibleContextBase.cxx | 4
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/editsel.cxx | 4
editeng/source/editeng/eehtml.cxx | 2
editeng/source/editeng/impedit2.cxx | 4
editeng/source/editeng/impedit3.cxx | 2
editeng/source/rtf/rtfitem.cxx | 2
editeng/source/uno/unofdesc.cxx | 10
editeng/source/uno/unofield.cxx | 2
editeng/source/uno/unotext.cxx | 8
editeng/source/uno/unotext2.cxx | 2
editeng/source/xml/xmltxtexp.cxx | 4
embeddedobj/source/general/docholder.cxx | 20 -
embeddedobj/source/general/intercept.cxx | 24 +-
eventattacher/source/eventattacher.cxx | 14 -
extensions/source/bibliography/framectr.cxx | 18 -
extensions/source/plugin/base/plmodel.cxx | 2
extensions/source/plugin/base/xplugin.cxx | 8
extensions/source/plugin/inc/plugin/plctrl.hxx | 2
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2
extensions/source/plugin/unx/npnapi.cxx | 2
extensions/source/plugin/unx/npwrap.cxx | 4
extensions/source/propctrlr/browserline.cxx | 2
extensions/source/scanner/sane.cxx | 4
filter/source/flash/swfdialog.cxx | 2
filter/source/flash/swffilter.cxx | 2
filter/source/flash/swfwriter1.cxx | 4
filter/source/graphicfilter/eps/eps.cxx | 2
filter/source/graphicfilter/icgm/cgm.cxx | 4
filter/source/graphicfilter/ieps/ieps.cxx | 6
filter/source/graphicfilter/ipcd/ipcd.cxx | 32 +-
filter/source/graphicfilter/ipcx/ipcx.cxx | 2
filter/source/msfilter/escherex.cxx | 2
filter/source/msfilter/msdffimp.cxx | 12 -
filter/source/msfilter/svdfppt.cxx | 6
filter/source/odfflatxml/OdfFlatXml.cxx | 2
filter/source/pdf/pdfdialog.cxx | 2
filter/source/pdf/pdffilter.cxx | 2
filter/source/pdf/pdfinteract.cxx | 2
filter/source/placeware/filter.cxx | 2
filter/source/placeware/zip.cxx | 2
filter/source/svg/svgreader.cxx | 2
filter/source/svg/svgwriter.cxx | 4
filter/source/t602/t602filter.cxx | 4
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 2
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 2
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2
filter/source/xsltfilter/XSLTFilter.cxx | 4
forms/source/component/DatabaseForm.cxx | 4
formula/source/ui/dlg/funcpage.cxx | 6
formula/source/ui/dlg/parawin.cxx | 4
framework/source/classes/menumanager.cxx | 2
framework/source/dispatch/menudispatcher.cxx | 10
framework/source/dispatch/popupmenudispatcher.cxx | 4
framework/source/fwe/classes/actiontriggercontainer.cxx | 8
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 10
framework/source/fwe/helper/actiontriggerhelper.cxx | 4
framework/source/fwe/helper/propertysetcontainer.cxx | 12 -
framework/source/fwe/xml/menudocumenthandler.cxx | 8
framework/source/fwe/xml/statusbardocumenthandler.cxx | 6
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 6
framework/source/fwi/uielement/constitemcontainer.cxx | 2
framework/source/fwi/uielement/itemcontainer.cxx | 12 -
framework/source/fwi/uielement/rootitemcontainer.cxx | 16 -
framework/source/helper/ocomponentaccess.cxx | 2
framework/source/helper/oframes.cxx | 2
framework/source/layoutmanager/layoutmanager.cxx | 2
framework/source/services/substitutepathvars.cxx | 8
framework/source/tabwin/tabwindow.cxx | 2
framework/source/uielement/addonstoolbarwrapper.cxx | 2
framework/source/uielement/controlmenucontroller.cxx | 4
framework/source/uielement/fontmenucontroller.cxx | 4
framework/source/uielement/fontsizemenucontroller.cxx | 4
framework/source/uielement/headermenucontroller.cxx | 4
framework/source/uielement/langselectionmenucontroller.cxx | 4
framework/source/uielement/macrosmenucontroller.cxx | 4
framework/source/uielement/menubarmanager.cxx | 10
framework/source/uielement/newmenucontroller.cxx | 4
framework/source/uielement/objectmenucontroller.cxx | 4
framework/source/uielement/recentfilesmenucontroller.cxx | 4
framework/source/uielement/statusbarwrapper.cxx | 2
framework/source/uielement/toolbarsmenucontroller.cxx | 6
framework/source/uielement/toolbarwrapper.cxx | 2
framework/source/uifactory/addonstoolbarfactory.cxx | 2
framework/source/xml/imagesdocumenthandler.cxx | 10
helpcompiler/source/HelpLinker.cxx | 2
hwpfilter/source/formula.h | 2
hwpfilter/source/hgzip.cxx | 6
hwpfilter/source/hwpreader.cxx | 2
hwpfilter/source/hwpreader.hxx | 2
hwpfilter/source/lexer.cxx | 12 -
i18npool/inc/transliteration_Ignore.hxx | 4
i18npool/source/localedata/saxparser.cxx | 4
i18npool/source/registerservices/registerservices.cxx | 8
i18npool/source/search/textsearch.cxx | 4
i18npool/source/transliteration/fullwidthToHalfwidth.cxx | 6
i18npool/source/transliteration/halfwidthToFullwidth.cxx | 6
i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx | 2
i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx | 2
i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx | 2
i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx | 2
i18npool/source/transliteration/ignoreSpace_ja_JP.cxx | 2
i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx | 2
i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx | 2
i18npool/source/transliteration/largeToSmall_ja_JP.cxx | 2
i18npool/source/transliteration/smallToLarge_ja_JP.cxx | 2
include/com/sun/star/uno/Any.hxx | 50 ++--
include/com/sun/star/uno/Sequence.hxx | 18 -
include/cppu/Map.hxx | 4
include/osl/thread.hxx | 4
include/svtools/editbrowsebox.hxx | 2
include/tools/debug.hxx | 2
include/ucbhelper/macros.hxx | 4
include/vcl/opengl/OpenGLContext.hxx | 2
io/source/TextInputStream/TextInputStream.cxx | 2
io/source/TextOutputStream/TextOutputStream.cxx | 2
io/source/acceptor/acc_pipe.cxx | 2
io/source/acceptor/acc_socket.cxx | 2
io/source/acceptor/acceptor.cxx | 2
io/source/connector/connector.cxx | 6
io/source/stm/odata.cxx | 2
io/source/stm/omark.cxx | 4
io/source/stm/opump.cxx | 6
jvmfwk/source/elements.cxx | 4
jvmfwk/source/framework.cxx | 6
l10ntools/source/xmlparse.cxx | 8
libreofficekit/source/gtk/lokdocview.cxx | 2
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 8
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 8
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 8
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 8
linguistic/source/convdic.cxx | 8
linguistic/source/convdiclist.cxx | 4
linguistic/source/dicimp.cxx | 2
linguistic/source/dlistimp.cxx | 4
linguistic/source/gciterator.cxx | 2
linguistic/source/lngopt.cxx | 8
linguistic/source/lngsvcmgr.cxx | 12 -
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 4
mysqlc/source/mysqlc_connection.cxx | 2
mysqlc/source/mysqlc_resultset.cxx | 2
mysqlc/source/mysqlc_resultset.hxx | 2
mysqlc/source/mysqlc_statement.cxx | 2
o3tl/qa/test-range.cxx | 2
oox/source/ppt/dgmimport.cxx | 2
oox/source/ppt/dgmlayout.cxx | 2
oox/source/ppt/pptshapegroupcontext.cxx | 4
oox/source/shape/ShapeContextHandler.cxx | 2
oox/source/shape/ShapeDrawingFragmentHandler.cxx | 2
opencl/source/opencl_device.cxx | 22 -
package/source/xstor/owriteablestream.cxx | 2
package/source/xstor/xstorage.cxx | 6
pyuno/source/module/pyuno.cxx | 46 ++--
pyuno/source/module/pyuno_callable.cxx | 46 ++--
pyuno/source/module/pyuno_runtime.cxx | 48 ++--
reportdesign/source/ui/report/ViewsWindow.cxx | 2
rsc/inc/rscclobj.hxx | 4
rsc/inc/rsctools.hxx | 2
rsc/source/parser/rsckey.cxx | 4
rsc/source/prj/start.cxx | 4
rsc/source/res/rscclass.cxx | 4
rsc/source/res/rscconst.cxx | 4
rsc/source/tools/rsctools.cxx | 6
rsc/source/tools/rsctree.cxx | 12 -
sal/osl/unx/conditn.cxx | 2
sal/osl/unx/file.cxx | 4
sal/osl/unx/file_misc.cxx | 2
sal/osl/unx/process.cxx | 6
sal/osl/unx/profile.cxx | 2
sal/osl/unx/socket.cxx | 34 +-
sal/osl/unx/thread.cxx | 6
sal/qa/osl/file/osl_File.cxx | 2
sal/qa/osl/file/test_cpy_wrt_file.cxx | 2
sal/qa/osl/module/osl_Module.cxx | 6
sal/rtl/alloc_cache.cxx | 4
sal/rtl/cipher.cxx | 14 -
sal/rtl/digest.cxx | 26 +-
sal/rtl/random.cxx | 6
sal/textenc/textcvt.cxx | 4
sax/source/expatwrap/attrlistimpl.cxx | 2
sc/inc/chgtrack.hxx | 2
sc/source/core/data/document.cxx | 2
sc/source/core/opencl/formulagroupcl.cxx | 46 ++--
sc/source/core/tool/appoptio.cxx | 2
sc/source/core/tool/chartpos.cxx | 2
sc/source/core/tool/defaultsoptions.cxx | 2
sc/source/core/tool/docoptio.cxx | 2
sc/source/core/tool/formulaopt.cxx | 2
sc/source/core/tool/inputopt.cxx | 2
sc/source/core/tool/printopt.cxx | 2
sc/source/core/tool/rangelst.cxx | 2
sc/source/core/tool/viewopti.cxx | 2
sc/source/filter/xml/xmlimprt.cxx | 10
sc/source/filter/xml/xmlwrap.cxx | 2
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 2
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 4
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 4
sc/source/ui/app/drwtrans.cxx | 2
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 8
sc/source/ui/dbgui/consdlg.cxx | 8
sc/source/ui/docshell/docfunc.cxx | 2
sc/source/ui/docshell/docsh6.cxx | 2
sc/source/ui/docshell/impex.cxx | 2
sc/source/ui/drawfunc/fuconstr.cxx | 2
sc/source/ui/drawfunc/fusel.cxx | 4
sc/source/ui/drawfunc/futext.cxx | 8
sc/source/ui/formdlg/dwfunctr.cxx | 4
sc/source/ui/inc/impex.hxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 10
sc/source/ui/miscdlgs/anyrefdg.cxx | 2
sc/source/ui/miscdlgs/crnrdlg.cxx | 4
sc/source/ui/miscdlgs/mvtabdlg.cxx | 2
sc/source/ui/miscdlgs/retypepassdlg.cxx | 2
sc/source/ui/miscdlgs/solvrdlg.cxx | 6
sc/source/ui/miscdlgs/tabopdlg.cxx | 6
sc/source/ui/pagedlg/areasdlg.cxx | 12 -
sc/source/ui/unoobj/appluno.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 12 -
sc/source/ui/unoobj/chart2uno.cxx | 2
sc/source/ui/unoobj/dapiuno.cxx | 2
sc/source/ui/unoobj/datauno.cxx | 2
sc/source/ui/unoobj/docuno.cxx | 2
sc/source/ui/unoobj/linkuno.cxx | 6
sc/source/ui/unoobj/notesuno.cxx | 2
sc/source/ui/unoobj/servuno.cxx | 24 +-
sc/source/ui/unoobj/shapeuno.cxx | 2
sc/source/ui/unoobj/viewuno.cxx | 4
sc/source/ui/vba/vbaapplication.cxx | 4
sc/source/ui/view/gridwin.cxx | 6
sc/source/ui/view/tabcont.cxx | 2
sc/source/ui/view/tabvwsh4.cxx | 4
sc/source/ui/view/tabvwsh9.cxx | 4
sc/source/ui/view/viewdata.cxx | 4
sc/source/ui/view/viewfun5.cxx | 2
scaddins/source/analysis/analysis.cxx | 2
scaddins/source/datefunc/datefunc.cxx | 2
scaddins/source/pricing/pricing.cxx | 2
scripting/source/dlgprov/dlgevtatt.cxx | 2
scripting/source/provider/MasterScriptProvider.cxx | 6
scripting/source/stringresource/stringresource.cxx | 2
scripting/source/vbaevents/eventhelper.cxx | 12 -
sd/source/core/CustomAnimationPreset.cxx | 2
sd/source/core/drawdoc3.cxx | 6
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sd/source/filter/ppt/pptin.cxx | 16 -
sd/source/filter/ppt/propread.cxx | 8
sd/source/filter/xml/sdxmlwrp.cxx | 2
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 2
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 2
sd/source/ui/animations/CustomAnimationPane.cxx | 10
sd/source/ui/annotations/annotationwindow.cxx | 2
sd/source/ui/app/sdmod2.cxx | 2
sd/source/ui/dlg/sddlgfact.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 2
sd/source/ui/framework/configuration/ConfigurationController.cxx | 2
sd/source/ui/framework/factories/ChildWindowPane.cxx | 2
sd/source/ui/func/fucon3d.cxx | 2
sd/source/ui/func/fuconarc.cxx | 2
sd/source/ui/func/fuconcs.cxx | 2
sd/source/ui/func/fuconrec.cxx | 4
sd/source/ui/func/fuconstr.cxx | 2
sd/source/ui/func/fuconuno.cxx | 2
sd/source/ui/func/fudraw.cxx | 6
sd/source/ui/func/fuediglu.cxx | 8
sd/source/ui/func/fupage.cxx | 4
sd/source/ui/func/fuprobjs.cxx | 2
sd/source/ui/func/fusel.cxx | 14 -
sd/source/ui/func/futext.cxx | 10
sd/source/ui/remotecontrol/BluetoothServer.cxx | 2
sd/source/ui/sidebar/NavigatorWrapper.cxx | 2
sd/source/ui/unoidl/DrawController.cxx | 2
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2
sd/source/ui/unoidl/unocpres.cxx | 8
sd/source/ui/unoidl/unolayer.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 24 +-
sd/source/ui/unoidl/unopage.cxx | 18 -
sd/source/ui/unoidl/unopool.cxx | 2
sd/source/ui/view/drviews6.cxx | 2
sd/source/ui/view/drviewsg.cxx | 4
sd/source/ui/view/frmview.cxx | 2
sd/source/ui/view/sdview.cxx | 4
sd/source/ui/view/viewshel.cxx | 2
sdext/source/minimizer/pppoptimizerdialog.cxx | 2
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 6
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4
sdext/source/presenter/PresenterAccessibility.cxx | 2
sfx2/source/appl/appinit.cxx | 2
sfx2/source/appl/helpinterceptor.cxx | 4
sfx2/source/appl/linkmgr2.cxx | 2
sfx2/source/appl/workwin.cxx | 2
sfx2/source/bastyp/progress.cxx | 2
sfx2/source/control/bindings.cxx | 2
sfx2/source/control/shell.cxx | 4
sfx2/source/control/statcach.cxx | 6
sfx2/source/control/unoctitm.cxx | 24 +-
sfx2/source/dialog/printopt.cxx | 8
sfx2/source/dialog/splitwin.cxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 10
sot/qa/cppunit/test_sot.cxx | 2
sot/source/base/factory.cxx | 2
sot/source/base/formats.cxx | 2
sot/source/sdstor/ucbstorage.cxx | 20 -
starmath/source/accessibility.cxx | 2
starmath/source/dialog.cxx | 2
starmath/source/mathmlimport.cxx | 8
starmath/source/utility.cxx | 2
stoc/source/corereflection/base.hxx | 2
stoc/source/corereflection/crarray.cxx | 16 -
stoc/source/corereflection/crcomp.cxx | 10
stoc/source/corereflection/crefl.cxx | 10
stoc/source/corereflection/crenum.cxx | 4
stoc/source/corereflection/criface.cxx | 8
stoc/source/defaultregistry/defaultregistry.cxx | 12 -
stoc/source/inspect/introspection.cxx | 2
stoc/source/invocation/invocation.cxx | 4
stoc/source/invocation_adapterfactory/iafactory.cxx | 2
stoc/source/security/access_controller.cxx | 18 -
stoc/source/security/file_policy.cxx | 2
stoc/source/servicemanager/servicemanager.cxx | 8
store/source/store.cxx | 8
svl/source/items/globalnameitem.cxx | 4
svl/source/items/itemset.cxx | 6
svl/source/items/lckbitem.cxx | 2
svl/source/numbers/zforlist.cxx | 2
svtools/source/contnr/imivctl1.cxx | 2
svtools/source/contnr/svimpbox.cxx | 6
svtools/source/contnr/treelistbox.cxx | 2
svtools/source/control/accessibleruler.cxx | 2
svtools/source/control/ctrltool.cxx | 8
svtools/source/control/tabbar.cxx | 4
svtools/source/control/valueacc.cxx | 2
svtools/source/svhtml/htmlkywd.cxx | 16 -
svtools/source/svrtf/rtfkeywd.cxx | 4
svtools/source/uno/popupmenucontrollerbase.cxx | 2
svtools/source/uno/popupwindowcontroller.cxx | 4
svtools/source/uno/svtxgridcontrol.cxx | 4
svtools/source/uno/unoiface.cxx | 8
svtools/source/uno/unoimap.cxx | 10
svx/source/accessibility/AccessibleShape.cxx | 2
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 2
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 18 -
svx/source/dialog/dlgctl3d.cxx | 2
svx/source/dialog/docrecovery.cxx | 4
svx/source/dialog/imapwnd.cxx | 14 -
svx/source/fmcomp/fmgridcl.cxx | 2
svx/source/fmcomp/fmgridif.cxx | 24 +-
svx/source/fmcomp/gridcols.cxx | 2
svx/source/form/fmdpage.cxx | 2
svx/source/form/fmshimp.cxx | 12 -
svx/source/form/fmsrcimp.cxx | 4
svx/source/form/formdispatchinterceptor.cxx | 2
svx/source/form/navigatortreemodel.cxx | 10
svx/source/gallery2/galbrws2.cxx | 6
svx/source/gallery2/galtheme.cxx | 16 -
svx/source/svdraw/svdcrtv.cxx | 2
svx/source/svdraw/svdibrow.cxx | 2
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdoedge.cxx | 6
svx/source/svdraw/svdograf.cxx | 4
svx/source/svdraw/svdview.cxx | 6
svx/source/tbxctrls/tbcontrl.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 2
svx/source/unodraw/UnoNamespaceMap.cxx | 2
svx/source/unodraw/XPropertyTable.cxx | 12 -
svx/source/unodraw/unomod.cxx | 12 -
svx/source/unodraw/unomtabl.cxx | 2
svx/source/unodraw/unopage.cxx | 2
svx/source/unodraw/unoshape.cxx | 4
svx/source/unodraw/unoshcol.cxx | 4
svx/source/unodraw/unoshtxt.cxx | 2
sw/inc/ftninfo.hxx | 4
sw/source/core/access/accpara.cxx | 2
sw/source/core/bastyp/calc.cxx | 4
sw/source/core/crsr/callnk.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 4
sw/source/core/crsr/pam.cxx | 2
sw/source/core/crsr/viscrs.cxx | 2
sw/source/core/doc/CntntIdxStore.cxx | 2
sw/source/core/doc/acmplwrd.cxx | 2
sw/source/core/doc/doc.cxx | 2
sw/source/core/doc/docglos.cxx | 2
sw/source/core/doc/doclay.cxx | 2
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/lineinfo.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 2
sw/source/core/docnode/ndsect.cxx | 2
sw/source/core/docnode/ndtbl.cxx | 14 -
sw/source/core/docnode/ndtbl1.cxx | 2
sw/source/core/docnode/node.cxx | 12 -
sw/source/core/docnode/node2lay.cxx | 2
sw/source/core/docnode/section.cxx | 14 -
sw/source/core/draw/dflyobj.cxx | 2
sw/source/core/draw/dview.cxx | 2
sw/source/core/edit/editsh.cxx | 4
sw/source/core/edit/edws.cxx | 2
sw/source/core/fields/authfld.cxx | 12 -
sw/source/core/fields/cellfml.cxx | 8
sw/source/core/fields/ddetbl.cxx | 2
sw/source/core/frmedt/fedesc.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 6
sw/source/core/frmedt/feshview.cxx | 6
sw/source/core/frmedt/fews.cxx | 8
sw/source/core/graphic/ndgrf.cxx | 4
sw/source/core/layout/atrfrm.cxx | 6
sw/source/core/layout/calcmove.cxx | 6
sw/source/core/layout/dumpfilter.cxx | 2
sw/source/core/layout/findfrm.cxx | 6
sw/source/core/layout/flowfrm.cxx | 2
sw/source/core/layout/fly.cxx | 2
sw/source/core/layout/flyincnt.cxx | 2
sw/source/core/layout/flylay.cxx | 2
sw/source/core/layout/frmtool.cxx | 10
sw/source/core/layout/ftnfrm.cxx | 4
sw/source/core/layout/layact.cxx | 6
sw/source/core/layout/paintfrm.cxx | 10
sw/source/core/layout/sectfrm.cxx | 8
sw/source/core/layout/tabfrm.cxx | 4
sw/source/core/layout/wsfrm.cxx | 4
sw/source/core/text/EnhancedPDFExportHelper.cxx | 14 -
sw/source/core/text/frmcrsr.cxx | 4
sw/source/core/text/itrform2.cxx | 16 -
sw/source/core/text/porfld.cxx | 4
sw/source/core/text/porlin.hxx | 2
sw/source/core/text/porrst.cxx | 2
sw/source/core/text/txtcache.cxx | 2
sw/source/core/text/txtfly.cxx | 2
sw/source/core/text/widorp.cxx | 2
sw/source/core/tox/tox.cxx | 2
sw/source/core/txtnode/atrflyin.cxx | 2
sw/source/core/txtnode/thints.cxx | 4
sw/source/core/undo/undobj1.cxx | 2
sw/source/core/undo/untbl.cxx | 4
sw/source/core/unocore/unocoll.cxx | 14 -
sw/source/core/unocore/unocrsrhelper.cxx | 2
sw/source/core/unocore/unodraw.cxx | 8
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unoobj2.cxx | 2
sw/source/core/unocore/unoportenum.cxx | 2
sw/source/core/unocore/unotbl.cxx | 4
sw/source/core/view/vnew.cxx | 8
sw/source/filter/html/htmlform.cxx | 12 -
sw/source/filter/html/htmlnumreader.cxx | 4
sw/source/filter/html/svxcss1.cxx | 4
sw/source/filter/ww8/docxexportfilter.cxx | 2
sw/source/filter/ww8/rtfexportfilter.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 16 -
sw/source/filter/ww8/ww8scan.cxx | 6
sw/source/filter/ww8/ww8scan.hxx | 4
sw/source/filter/xml/swxml.cxx | 2
sw/source/filter/xml/wrtxml.cxx | 4
sw/source/ui/dbui/selectdbtabledialog.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 8
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/app/docsh2.cxx | 6
sw/source/uibase/dbui/dbmgr.cxx | 4
sw/source/uibase/dbui/dbtree.cxx | 2
sw/source/uibase/dochdl/swdtflvr.cxx | 8
sw/source/uibase/ribbar/drawbase.cxx | 2
sw/source/uibase/uiview/view.cxx | 4
sw/source/uibase/uno/dlelstnr.cxx | 4
sw/source/uibase/uno/unoatxt.cxx | 2
sw/source/uibase/uno/unodispatch.cxx | 20 -
sw/source/uibase/uno/unomailmerge.cxx | 4
sw/source/uibase/uno/unotxdoc.cxx | 6
sw/source/uibase/utlui/content.cxx | 32 +-
sw/source/uibase/wrtsh/wrtsh1.cxx | 4
testtools/source/bridgetest/bridgetest.cxx | 6
testtools/source/bridgetest/cppobj.cxx | 2
toolkit/source/awt/vclxaccessiblecomponent.cxx | 2
toolkit/source/awt/vclxmenu.cxx | 16 -
toolkit/source/awt/vclxtoolkit.cxx | 18 -
toolkit/source/awt/vclxwindow.cxx | 46 ++--
toolkit/source/awt/vclxwindows.cxx | 48 ++--
toolkit/source/controls/controlmodelcontainerbase.cxx | 4
toolkit/source/controls/dialogcontrol.cxx | 2
toolkit/source/controls/geometrycontrolmodel.cxx | 2
toolkit/source/controls/grid/gridcontrol.cxx | 2
toolkit/source/controls/roadmapcontrol.cxx | 10
toolkit/source/controls/tabpagecontainer.cxx | 6
toolkit/source/controls/tkscrollbar.cxx | 2
toolkit/source/controls/unocontrol.cxx | 4
toolkit/source/controls/unocontrolmodel.cxx | 4
toolkit/source/controls/unocontrols.cxx | 14 -
toolkit/source/helper/vclunohelper.cxx | 2
tools/source/debug/debug.cxx | 2
tools/source/generic/bigint.cxx | 6
tools/source/rc/resmgr.cxx | 2
tools/source/zcodec/zcodec.cxx | 6
ucb/source/core/FileAccess.cxx | 8
ucb/source/core/ucbstore.cxx | 4
ucb/source/sorter/sortdynres.cxx | 4
ucb/source/sorter/sortresult.cxx | 4
ucb/source/ucp/file/bc.cxx | 2
ucb/source/ucp/file/filstr.cxx | 2
ucb/source/ucp/file/prov.cxx | 2
ucb/source/ucp/file/shell.cxx | 4
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 4
ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx | 2
ucb/source/ucp/webdav-neon/NeonSession.cxx | 8
unotools/source/config/configvaluecontainer.cxx | 2
unotools/source/misc/fontcvt.cxx | 2
unotools/source/streaming/streamhelper.cxx | 2
unotools/source/streaming/streamwrap.cxx | 2
unotools/source/ucbhelper/ucblockbytes.cxx | 8
vcl/generic/fontmanager/parseAFM.cxx | 2
vcl/generic/glyphs/gcach_ftyp.cxx | 2
vcl/generic/glyphs/gcach_layout.cxx | 2
vcl/generic/glyphs/scrptrun.h | 4
vcl/generic/print/prtsetup.cxx | 14 -
vcl/generic/print/text_gfx.cxx | 2
vcl/headless/svpdummies.cxx | 2
vcl/headless/svpframe.cxx | 2
vcl/osx/PictToBmpFlt.cxx | 2
vcl/osx/a11ywrapper.mm | 4
vcl/osx/salframeview.mm | 6
vcl/osx/salinst.cxx | 2
vcl/qa/cppunit/complextext.cxx | 2
vcl/quartz/ctfonts.cxx | 2
vcl/quartz/salbmp.cxx | 2
vcl/quartz/salgdi.cxx | 4
vcl/quartz/salgdicommon.cxx | 2
vcl/source/app/dndhelp.cxx | 2
vcl/source/app/svapp.cxx | 2
vcl/source/components/dtranscomp.cxx | 6
vcl/source/control/combobox.cxx | 4
vcl/source/control/ilstbox.cxx | 4
vcl/source/control/lstbox.cxx | 4
vcl/source/edit/vclmedit.cxx | 6
vcl/source/fontsubset/gsub.cxx | 2
vcl/source/fontsubset/ttcr.cxx | 8
vcl/source/gdi/alpha.cxx | 4
vcl/source/gdi/gdimetafiletools.cxx | 4
vcl/source/gdi/gdimtf.cxx | 2
vcl/source/gdi/impanmvw.cxx | 2
vcl/source/gdi/metaact.cxx | 110 ++++-----
vcl/source/gdi/pdfwriter_impl.cxx | 4
vcl/source/gdi/pdfwriter_impl2.cxx | 2
vcl/source/opengl/OpenGLContext.cxx | 2
vcl/source/outdev/bitmap.cxx | 4
vcl/source/outdev/font.cxx | 2
vcl/source/outdev/text.cxx | 6
vcl/source/outdev/transparent.cxx | 4
vcl/source/window/dialog.cxx | 2
vcl/source/window/event.cxx | 10
vcl/source/window/paint.cxx | 2
vcl/source/window/resource.cxx | 2
vcl/source/window/syswin.cxx | 4
vcl/source/window/window.cxx | 4
vcl/unx/generic/app/i18n_cb.cxx | 34 +-
vcl/unx/generic/app/i18n_ic.cxx | 14 -
vcl/unx/generic/app/i18n_im.cxx | 14 -
vcl/unx/generic/app/i18n_keysym.cxx | 10
vcl/unx/generic/app/i18n_status.cxx | 2
vcl/unx/generic/app/saldisp.cxx | 4
vcl/unx/generic/app/salinst.cxx | 2
vcl/unx/generic/dtrans/X11_service.cxx | 4
vcl/unx/generic/window/salframe.cxx | 6
vcl/unx/gtk/a11y/atkcomponent.cxx | 4
vcl/unx/gtk/a11y/atkfactory.cxx | 8
vcl/unx/gtk/a11y/atkhypertext.cxx | 2
vcl/unx/gtk/a11y/atkregistry.cxx | 6
vcl/unx/gtk/a11y/atktextattributes.cxx | 2
vcl/unx/gtk/a11y/atkutil.cxx | 8
vcl/unx/gtk/a11y/atkwindow.cxx | 8
vcl/unx/gtk/a11y/atkwrapper.cxx | 6
vcl/unx/gtk/app/gtkdata.cxx | 2
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 16 -
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 2
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 68 ++---
vcl/unx/gtk/window/gtksalframe.cxx | 20 -
vcl/unx/gtk/window/hudawareness.cxx | 2
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 26 +-
vcl/unx/kde4/KDESalFrame.cxx | 4
vcl/workben/outdevgrind.cxx | 2
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 2
writerperfect/source/calc/MWAWCalcImportFilter.cxx | 2
writerperfect/source/draw/CDRImportFilter.cxx | 2
writerperfect/source/draw/CMXImportFilter.cxx | 2
writerperfect/source/draw/FreehandImportFilter.cxx | 2
writerperfect/source/draw/MSPUBImportFilter.cxx | 2
writerperfect/source/draw/MWAWDrawImportFilter.cxx | 2
writerperfect/source/draw/PageMakerImportFilter.cxx | 2
writerperfect/source/draw/VisioImportFilter.cxx | 2
writerperfect/source/draw/WPGImportFilter.cxx | 2
writerperfect/source/impress/KeynoteImportFilter.cxx | 2
writerperfect/source/impress/MWAWPresentationImportFilter.cxx | 2
writerperfect/source/writer/AbiWordImportFilter.cxx | 2
writerperfect/source/writer/EBookImportFilter.cxx | 2
writerperfect/source/writer/MSWorksImportFilter.cxx | 2
writerperfect/source/writer/MWAWImportFilter.cxx | 2
writerperfect/source/writer/WordPerfectImportFilter.cxx | 4
xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx | 12 -
xmlhelp/source/cxxhelp/provider/databases.cxx | 4
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 6
xmlhelp/source/treeview/tvfactory.cxx | 2
xmloff/source/chart/SchXMLExport.cxx | 16 -
xmloff/source/chart/SchXMLImport.cxx | 8
xmloff/source/core/xmlexp.cxx | 2
xmloff/source/draw/animationimport.cxx | 2
xmloff/source/draw/sdxmlexp.cxx | 2
xmloff/source/draw/sdxmlimp.cxx | 2
xmloff/source/meta/MetaExportComponent.cxx | 4
xmloff/source/meta/MetaImportComponent.cxx | 2
xmloff/source/text/XMLAutoTextEventExport.cxx | 4
xmloff/source/text/XMLAutoTextEventImport.cxx | 2
xmloff/source/text/XMLPropertyBackpatcher.cxx | 2
xmloff/source/text/txtimp.cxx | 2
xmloff/source/transform/OOo2Oasis.cxx | 6
xmloff/source/transform/Oasis2OOo.cxx | 2
xmlsecurity/source/component/documentdigitalsignatures.cxx | 2
xmlsecurity/source/dialogs/certificateviewer.cxx | 4
xmlsecurity/source/framework/decryptorimpl.cxx | 2
xmlsecurity/source/framework/encryptionengine.cxx | 2
xmlsecurity/source/framework/encryptorimpl.cxx | 2
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 2
xmlsecurity/source/framework/signaturecreatorimpl.cxx | 2
xmlsecurity/source/framework/signatureengine.cxx | 4
xmlsecurity/source/framework/signatureverifierimpl.cxx | 2
xmlsecurity/source/helper/xmlsignaturehelper.cxx | 2
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 2
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 2
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 2
xmlsecurity/source/xmlsec/saxhelper.cxx | 2
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 2
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 2
xmlsecurity/source/xmlsec/xmlstreamio.cxx | 2
787 files changed, 2143 insertions(+), 2151 deletions(-)
New commits:
commit f1bbda1c26dc16642038ea70288eec60b43520b6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jun 8 16:30:14 2015 +0200
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: Ic714e7f887b421e491544b7c985351077170344d
diff --git a/compilerplugins/clang/cstylecast.cxx b/compilerplugins/clang/cstylecast.cxx
index dadba42..9d96ac6 100644
--- a/compilerplugins/clang/cstylecast.cxx
+++ b/compilerplugins/clang/cstylecast.cxx
@@ -165,14 +165,6 @@ bool CStyleCast::VisitCStyleCastExpr(const CStyleCastExpr * expr) {
expr->getTypeAsWritten()))
{
perf = "const_cast";
- } else if (expr->getSubExprAsWritten()->getType() != expr->getType()
- && (!t1.isMoreQualifiedThan(t2)
- || ((t1.getUnqualifiedType().getCanonicalType()
- .getTypePtr())
- != (t2.getUnqualifiedType().getCanonicalType()
- .getTypePtr()))))
- {
- return true;
}
}
std::string incompFrom;
commit 642f4e574c80a29a226373a9d33273b113ebf689
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jun 8 16:30:07 2015 +0200
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: Idcaafa47f1891858d2ac4cdc536065cbc127b7c4
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index d7cce5c..1b01baa 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -512,7 +512,7 @@ Sequence< OUString > DocumentDigitalSignatures::GetSupportedServiceNames() throw
Reference< XInterface > DocumentDigitalSignatures_CreateInstance(
const Reference< XComponentContext >& rCtx) throw ( Exception )
{
- return (cppu::OWeakObject*) new DocumentDigitalSignatures( rCtx );
+ return static_cast<cppu::OWeakObject*>(new DocumentDigitalSignatures( rCtx ));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 3ed07b5..8dbd5e8 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -208,7 +208,7 @@ void CertificateViewerDetailsTP::InsertElement( const OUString& _rField, const O
{
SvTreeListEntry* pEntry = m_pElementsLB->InsertEntry( _rField );
m_pElementsLB->SetEntryText( _rValue, pEntry, 1 );
- pEntry->SetUserData( ( void* ) new Details_UserDatat( _rDetails, _bFixedWidthFont ) );
+ pEntry->SetUserData( static_cast<void*>(new Details_UserDatat( _rDetails, _bFixedWidthFont )) );
}
CertificateViewerDetailsTP::CertificateViewerDetailsTP( vcl::Window* _pParent, CertificateViewer* _pDlg )
@@ -472,7 +472,7 @@ SvTreeListEntry* CertificateViewerCertPathTP::InsertCert(
{
Image aImage = bValid ? maCertImage : maCertNotValidatedImage;
SvTreeListEntry* pEntry = mpCertPathLB->InsertEntry( _rName, aImage, aImage, _pParent );
- pEntry->SetUserData( ( void* ) new CertPath_UserData( rxCert, bValid ) );
+ pEntry->SetUserData( static_cast<void*>(new CertPath_UserData( rxCert, bValid )) );
return pEntry;
}
diff --git a/xmlsecurity/source/framework/decryptorimpl.cxx b/xmlsecurity/source/framework/decryptorimpl.cxx
index bb41a3d..03e15f6 100644
--- a/xmlsecurity/source/framework/decryptorimpl.cxx
+++ b/xmlsecurity/source/framework/decryptorimpl.cxx
@@ -196,7 +196,7 @@ cssu::Sequence< OUString > SAL_CALL DecryptorImpl_getSupportedServiceNames( )
cssu::Reference< cssu::XInterface > SAL_CALL DecryptorImpl_createInstance( const cssu::Reference< cssl::XMultiServiceFactory >& xMSF)
throw( cssu::Exception )
{
- return (cppu::OWeakObject*) new DecryptorImpl( comphelper::getComponentContext( xMSF ) );
+ return static_cast<cppu::OWeakObject*>(new DecryptorImpl( comphelper::getComponentContext( xMSF ) ));
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/framework/encryptionengine.cxx b/xmlsecurity/source/framework/encryptionengine.cxx
index 6b74377..30d8452 100644
--- a/xmlsecurity/source/framework/encryptionengine.cxx
+++ b/xmlsecurity/source/framework/encryptionengine.cxx
@@ -162,7 +162,7 @@ void EncryptionEngine::clearUp( ) const
xReferenceResolvedBroadcaster->removeReferenceResolvedListener(
m_nIdOfTemplateEC,
- static_cast<const Reference < cssxc::sax::XReferenceResolvedListener > >((SecurityEngine *)this));
+ static_cast<const Reference < cssxc::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<EncryptionEngine *>(this))));
m_xSAXEventKeeper->removeElementCollector(m_nIdOfTemplateEC);
diff --git a/xmlsecurity/source/framework/encryptorimpl.cxx b/xmlsecurity/source/framework/encryptorimpl.cxx
index 776b532..2914330 100644
--- a/xmlsecurity/source/framework/encryptorimpl.cxx
+++ b/xmlsecurity/source/framework/encryptorimpl.cxx
@@ -231,7 +231,7 @@ Reference< XInterface > SAL_CALL EncryptorImpl_createInstance(
const Reference< cssl::XMultiServiceFactory >& xMSF)
throw( Exception )
{
- return (cppu::OWeakObject*) new EncryptorImpl( comphelper::getComponentContext( xMSF ) );
+ return static_cast<cppu::OWeakObject*>(new EncryptorImpl( comphelper::getComponentContext( xMSF ) ));
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index 652b0f1..e6fa9ee 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -1378,7 +1378,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL SAXEventKeeperImpl_createInstance(
const cssu::Reference< cssl::XMultiServiceFactory > &)
throw( cssu::Exception )
{
- return (cppu::OWeakObject*) new SAXEventKeeperImpl();
+ return static_cast<cppu::OWeakObject*>(new SAXEventKeeperImpl());
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 68f0025..b9e3b69 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -245,7 +245,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureCreatorImpl_createInstance
const cssu::Reference< cssl::XMultiServiceFactory >& xMSF )
throw( cssu::Exception )
{
- return (cppu::OWeakObject*) new SignatureCreatorImpl( comphelper::getComponentContext( xMSF ) );
+ return static_cast<cppu::OWeakObject*>(new SignatureCreatorImpl( comphelper::getComponentContext( xMSF ) ));
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/framework/signatureengine.cxx b/xmlsecurity/source/framework/signatureengine.cxx
index 655b317..15285b5 100644
--- a/xmlsecurity/source/framework/signatureengine.cxx
+++ b/xmlsecurity/source/framework/signatureengine.cxx
@@ -176,7 +176,7 @@ void SignatureEngine::clearUp( ) const
xReferenceResolvedBroadcaster( m_xSAXEventKeeper, cssu::UNO_QUERY );
xReferenceResolvedBroadcaster->removeReferenceResolvedListener(
m_nIdOfTemplateEC,
- static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >((SecurityEngine *)this));
+ static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<SignatureEngine *>(this))));
m_xSAXEventKeeper->removeElementCollector(m_nIdOfTemplateEC);
@@ -186,7 +186,7 @@ void SignatureEngine::clearUp( ) const
{
xReferenceResolvedBroadcaster->removeReferenceResolvedListener(
*ii,
- static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >((SecurityEngine *)this));
+ static_cast<const cssu::Reference < cssxc::sax::XReferenceResolvedListener > >(static_cast<SecurityEngine *>(const_cast<SignatureEngine *>(this))));
m_xSAXEventKeeper->removeElementCollector(*ii);
}
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index 6ef0bed..9cad609 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -191,7 +191,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL SignatureVerifierImpl_createInstanc
const cssu::Reference< cssl::XMultiServiceFactory >& rSMgr)
throw( cssu::Exception )
{
- return (cppu::OWeakObject*) new SignatureVerifierImpl( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new SignatureVerifierImpl( comphelper::getComponentContext(rSMgr) ));
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index 84004ae..96b1909 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -329,7 +329,7 @@ IMPL_LINK( XMLSignatureHelper, SignatureVerifyResultListener, XMLSignatureVerify
IMPL_LINK( XMLSignatureHelper, StartVerifySignatureElement, const uno::Reference< com::sun::star::xml::sax::XAttributeList >*, pAttrs )
{
- if ( !maStartVerifySignatureHdl.IsSet() || maStartVerifySignatureHdl.Call( (void*)pAttrs ) )
+ if ( !maStartVerifySignatureHdl.IsSet() || maStartVerifySignatureHdl.Call( const_cast<css::uno::Reference<css::xml::sax::XAttributeList> *>(pAttrs) ) )
{
sal_Int32 nSignatureId = mpXSecController->getNewSecurityId();
mpXSecController->addSignature( nSignatureId );
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 2593470..6033fe9 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -87,7 +87,7 @@ void SAL_CALL ImplXMLSignatureListener::startElement( const OUString& aName, con
{
if ( aName == "Signature" )
{
- maStartVerifySignatureElementListener.Call( (void*)&xAttribs );
+ maStartVerifySignatureElementListener.Call( const_cast<css::uno::Reference<css::xml::sax::XAttributeList> *>(&xAttribs) );
}
if (m_xNextHandler.is())
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index abca1c9..2a2ad98 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -481,7 +481,7 @@ cssu::Sequence< OUString > SAL_CALL ONSSInitializer_getSupportedServiceNames( )
cssu::Reference< cssu::XInterface > SAL_CALL ONSSInitializer_createInstance( const cssu::Reference< cssl::XMultiServiceFactory > & rSMgr)
throw( cssu::Exception )
{
- return (cppu::OWeakObject*) new ONSSInitializer( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new ONSSInitializer( comphelper::getComponentContext(rSMgr) ));
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 7d26171..7b93d34 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -445,7 +445,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O
return NULL; // no need for exception cf. i40394
}
- derIssuer = SEC_ASN1EncodeItem( arena, NULL, ( void* )nmIssuer, SEC_ASN1_GET( CERT_NameTemplate ) ) ;
+ derIssuer = SEC_ASN1EncodeItem( arena, NULL, static_cast<void*>(nmIssuer), SEC_ASN1_GET( CERT_NameTemplate ) ) ;
if( derIssuer == NULL ) {
PL_strfree( chIssuer ) ;
CERT_DestroyName( nmIssuer ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
index 684aebc..3a88ffa 100644
--- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx
@@ -130,7 +130,7 @@ uno::Sequence< OUString > SAL_CALL SEInitializer_NssImpl_getSupportedServiceName
uno::Reference< uno::XInterface > SAL_CALL SEInitializer_NssImpl_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rxMSF)
throw( uno::Exception )
{
- return (cppu::OWeakObject*) new SEInitializer_NssImpl(comphelper::getComponentContext(rxMSF));
+ return static_cast<cppu::OWeakObject*>(new SEInitializer_NssImpl(comphelper::getComponentContext(rxMSF)));
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx
index b017efa..ea5fd51 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.cxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.cxx
@@ -285,7 +285,7 @@ void SAXHelper::startElement(
attrs[i] = NULL ;
}
- xmlFree( ( void* ) attrs ) ;
+ xmlFree( static_cast<void*>(attrs) ) ;
attrs = NULL ;
}
}
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index efa60a9..efc008a 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -1074,7 +1074,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL XMLDocumentWrapper_XmlSecImpl_creat
const cssu::Reference< cssu::XComponentContext > &)
throw( cssu::Exception )
{
- return (cppu::OWeakObject*) new XMLDocumentWrapper_XmlSecImpl( );
+ return static_cast<cppu::OWeakObject*>(new XMLDocumentWrapper_XmlSecImpl( ));
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index 69f6c51..d8de87a 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -91,7 +91,7 @@ cssu::Reference< cssu::XInterface > SAL_CALL
const cssu::Reference< cssu::XComponentContext > &)
throw( cssu::Exception )
{
- return (cppu::OWeakObject*) new XMLElementWrapper_XmlSecImpl(NULL);
+ return static_cast<cppu::OWeakObject*>(new XMLElementWrapper_XmlSecImpl(NULL));
}
/* XServiceInfo */
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
index 29fd957..cecd659 100644
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
@@ -98,7 +98,7 @@ void* xmlStreamOpen( const char* uri )
::com::sun::star::io::XInputStream* pInputStream ;
pInputStream = xInputStream.get() ;
pInputStream->acquire() ;
- return ( void* )pInputStream ;
+ return static_cast<void*>(pInputStream) ;
}
}
commit 689a4a69733cd40c93b34dec83d7f7ca52abedb5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jun 8 16:30:03 2015 +0200
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I6fa6ee6d9eaf98a00624ad353dc6d2c5687b0547
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 131a368..7f42635 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3759,7 +3759,7 @@ Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Referenc
{
// #110680#
// #103997# removed some flags from EXPORT_ALL
- return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_getImplementationName(), SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS ));
+ return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_getImplementationName(), SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS )));
}
// Oasis format
@@ -3778,9 +3778,9 @@ OUString SAL_CALL SchXMLExport_Oasis_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
// #103997# removed some flags from EXPORT_ALL
- return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr),
+ return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr),
SchXMLExport_Oasis_getImplementationName(),
- (SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS )) | SvXMLExportFlags::OASIS );
+ (SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS )) | SvXMLExportFlags::OASIS ));
}
// multiple storage version: one for content / styles / meta
@@ -3800,7 +3800,7 @@ OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr) throw( uno::Exception )
{
// #110680#
- return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Styles_getImplementationName(), SvXMLExportFlags::STYLES );
+ return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Styles_getImplementationName(), SvXMLExportFlags::STYLES ));
}
// Oasis format
@@ -3818,7 +3818,7 @@ OUString SAL_CALL SchXMLExport_Oasis_Styles_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
- return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Styles_getImplementationName(), SvXMLExportFlags::STYLES | SvXMLExportFlags::OASIS );
+ return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Styles_getImplementationName(), SvXMLExportFlags::STYLES | SvXMLExportFlags::OASIS ));
}
Sequence< OUString > SAL_CALL SchXMLExport_Content_getSupportedServiceNames() throw()
@@ -3836,7 +3836,7 @@ OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
// #110680#
- return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS );
+ return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS ));
}
// Oasis format
@@ -3854,7 +3854,7 @@ OUString SAL_CALL SchXMLExport_Oasis_Content_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
- return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS );
+ return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS | SvXMLExportFlags::OASIS ));
}
// Oasis format
@@ -3872,7 +3872,7 @@ OUString SAL_CALL SchXMLExport_Oasis_Meta_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLExport_Oasis_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
- return (cppu::OWeakObject*)new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Meta_getImplementationName(), SvXMLExportFlags::META | SvXMLExportFlags::OASIS );
+ return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Oasis_Meta_getImplementationName(), SvXMLExportFlags::META | SvXMLExportFlags::OASIS ));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 2c409e9..3cd2dc0 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -681,7 +681,7 @@ OUString SAL_CALL SchXMLImport_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
// #110680#
- return (cppu::OWeakObject*)new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_getImplementationName(), SvXMLImportFlags::ALL);
+ return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_getImplementationName(), SvXMLImportFlags::ALL));
}
// multiple storage version: one for content / styles / meta
@@ -701,7 +701,7 @@ OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
// #110680#
- return (cppu::OWeakObject*)new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES );
+ return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES ));
}
Sequence< OUString > SAL_CALL SchXMLImport_Content_getSupportedServiceNames() throw()
@@ -719,7 +719,7 @@ OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
// #110680#
- return (cppu::OWeakObject*)new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Content_getImplementationName(), SvXMLImportFlags::CONTENT | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS );
+ return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Content_getImplementationName(), SvXMLImportFlags::CONTENT | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS ));
}
Sequence< OUString > SAL_CALL SchXMLImport_Meta_getSupportedServiceNames() throw()
@@ -737,7 +737,7 @@ OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
// #110680#
- return (cppu::OWeakObject*)new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META );
+ return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META ));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 1f2a6b6..2033c01 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -403,7 +403,7 @@ void SvXMLExport::_InitCtor()
GetXMLToken(XML_NP_CSS3TEXT), GetXMLToken(XML_N_CSS3TEXT), XML_NAMESPACE_CSS3TEXT );
}
- mxAttrList = (xml::sax::XAttributeList*)mpAttrList;
+ mxAttrList = static_cast<xml::sax::XAttributeList*>(mpAttrList);
msGraphicObjectProtocol = "vnd.sun.star.GraphicObject:";
msEmbeddedObjectProtocol = "vnd.sun.star.EmbeddedObject:";
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index 62c7a38..495441e 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1431,7 +1431,7 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const
Reference< XInterface > SAL_CALL AnimationsImport_createInstance(const Reference< XMultiServiceFactory > & rSMgr) throw( Exception )
{
- return (cppu::OWeakObject*)new xmloff::AnimationsImport( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new xmloff::AnimationsImport( comphelper::getComponentContext(rSMgr) ));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 9371913..17cba20 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -2752,7 +2752,7 @@ OUString SAL_CALL classname##_getImplementationName() throw()\
}\
uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )\
{\
- return (cppu::OWeakObject*)new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags ); \
+ return static_cast<cppu::OWeakObject*>(new SdXMLExport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
}
SERVICE( XMLImpressExportOasis, "com.sun.star.comp.Impress.XMLOasisExporter", "XMLImpressExportOasis", false, SvXMLExportFlags::OASIS|SvXMLExportFlags::META|SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::SETTINGS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::EMBEDDED );
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index e87237e..f7df18e 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -264,7 +264,7 @@ OUString SAL_CALL classname##_getImplementationName() throw()\
}\
uno::Reference< uno::XInterface > SAL_CALL classname##_createInstance(const uno::Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )\
{\
- return (cppu::OWeakObject*)new SdXMLImport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags ); \
+ return static_cast<cppu::OWeakObject*>(new SdXMLImport( comphelper::getComponentContext(rSMgr), implementationname, draw, flags )); \
}
SERVICE( XMLImpressImportOasis, "com.sun.star.comp.Impress.XMLOasisImporter", "XMLImpressImportOasis", false, SvXMLImportFlags::ALL )
diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx
index e67f3ba..2fce736 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -200,7 +200,7 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportComponent_createInstance
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- return (cppu::OWeakObject*)new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportComponent_getImplementationName(), SvXMLExportFlags::META|SvXMLExportFlags::OASIS);
+ return static_cast<cppu::OWeakObject*>(new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportComponent_getImplementationName(), SvXMLExportFlags::META|SvXMLExportFlags::OASIS));
}
uno::Sequence< OUString > SAL_CALL XMLMetaExportOOO_getSupportedServiceNames()
@@ -221,7 +221,7 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaExportOOO_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- return (cppu::OWeakObject*)new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportOOO_getImplementationName(), SvXMLExportFlags::META);
+ return static_cast<cppu::OWeakObject*>(new XMLMetaExportComponent( comphelper::getComponentContext(rSMgr), XMLMetaExportOOO_getImplementationName(), SvXMLExportFlags::META));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 0e27109..0ddd4f5 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -92,7 +92,7 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaImportComponent_createInstance
throw( uno::Exception )
{
// #110680#
- return (cppu::OWeakObject*)new XMLMetaImportComponent( comphelper::getComponentContext(rSMgr));
+ return static_cast<cppu::OWeakObject*>(new XMLMetaImportComponent( comphelper::getComponentContext(rSMgr)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx
index d0c3ff8..c560bb1 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.cxx
@@ -226,7 +226,7 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventExport_createInstance(
const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*)new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExport_getImplementationName(), SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS);
+ return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExport_getImplementationName(), SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS));
}
// methods to support the component registration
@@ -248,7 +248,7 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventExportOOO_createInstance(
const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*)new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExportOOO_getImplementationName(), SvXMLExportFlags::ALL);
+ return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventExport( comphelper::getComponentContext(rSMgr), XMLAutoTextEventExportOOO_getImplementationName(), SvXMLExportFlags::ALL));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 6b6b3fb..340b03a 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -122,7 +122,7 @@ Reference< XInterface > SAL_CALL XMLAutoTextEventImport_createInstance(
const Reference< XMultiServiceFactory > & rSMgr)
throw( Exception )
{
- return (cppu::OWeakObject*)new XMLAutoTextEventImport( comphelper::getComponentContext(rSMgr) );
+ return static_cast<cppu::OWeakObject*>(new XMLAutoTextEventImport( comphelper::getComponentContext(rSMgr) ));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index 5844b09..2e78d2d 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -129,7 +129,7 @@ void XMLPropertyBackpatcher<A>::SetProperty(
{
// create backpatch list for this name
BackpatchListType* pTmp = new BackpatchListType() ;
- aBackpatchListMap[sName] = (void*)pTmp;
+ aBackpatchListMap[sName] = static_cast<void*>(pTmp);
}
// insert footnote
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 3854cde..89759dd 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1590,7 +1590,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
}
}
- GetTextListHelper().SetListItem( (XMLTextListItemContext *)0 );
+ GetTextListHelper().SetListItem( nullptr );
}
else
{
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index 07382bc..65591ad 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -2071,7 +2071,7 @@ Reference< XInterface > SAL_CALL OOo2OasisTransformer_createInstance(
const Reference< XMultiServiceFactory > & )
throw( Exception )
{
- return (cppu::OWeakObject*)new OOo2OasisTransformer();
+ return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer());
}
#define OOO_IMPORTER( className, implName, subServiceName ) \
@@ -2091,8 +2091,8 @@ Reference< XInterface > SAL_CALL className##_createInstance( \
const Reference< XMultiServiceFactory > & ) \
throw( Exception ) \
{ \
- return (cppu::OWeakObject*)new OOo2OasisTransformer( implName, \
- subServiceName ); \
+ return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer( implName, \
+ subServiceName )); \
}
OOO_IMPORTER( XMLWriterImportOOO,
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index 74bd9ad..61aa016c 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -2038,7 +2038,7 @@ Reference< XInterface > SAL_CALL Oasis2OOoTransformer_createInstance(
throw( Exception )
{
SAL_INFO("xmloff.transform", "Creating Oasis2OOoTransformer");
- return (cppu::OWeakObject*)new Oasis2OOoTransformer;
+ return static_cast<cppu::OWeakObject*>(new Oasis2OOoTransformer);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e7b4225fc8dbc8482150163b0e0c26f1fc3a7449
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jun 8 16:29:59 2015 +0200
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I4e24ee646763e758a404bf0832e31e5cebc9d71d
diff --git a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
index 1ed291f..bfcdb2e 100644
--- a/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/bufferedinputstream.cxx
@@ -61,11 +61,11 @@ BufferedInputStream::BufferedInputStream(const Reference<XInputStream>& xInputSt
{
tmp = m_pBuffer;
m_pBuffer = new sal_Int8[m_nBufferSize+num];
- memcpy((void *)(m_pBuffer),
- (void *)(tmp),
+ memcpy(static_cast<void *>(m_pBuffer),
+ static_cast<void *>(tmp),
sal_uInt32(m_nBufferSize));
- memcpy((void *)(m_pBuffer+m_nBufferSize),
- (void *)(aData.getArray()),
+ memcpy(static_cast<void *>(m_pBuffer+m_nBufferSize),
+ static_cast<void *>(aData.getArray()),
sal_uInt32(num));
m_nBufferSize += num;
delete[] tmp;
@@ -134,8 +134,8 @@ sal_Int32 SAL_CALL BufferedInputStream::readBytes( Sequence< sal_Int8 >& aData,s
if( aData.getLength() < nBytesToRead )
aData.realloc(nBytesToRead);
- memcpy((void*)(aData.getArray()),
- (void*)(m_pBuffer+m_nBufferLocation),
+ memcpy(static_cast<void*>(aData.getArray()),
+ static_cast<void*>(m_pBuffer+m_nBufferLocation),
nBytesToRead);
return nBytesToRead;
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 19a28f9..e9bcfbf 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -436,7 +436,7 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
OUString key = processLang(Language) + "/" + Module;
std::pair< ModInfoTable::iterator,bool > aPair =
- m_aModInfo.insert( ModInfoTable::value_type( key,(StaticModuleInformation*)0 ) );
+ m_aModInfo.insert( ModInfoTable::value_type( key,nullptr ) );
ModInfoTable::iterator it = aPair.first;
@@ -836,7 +836,7 @@ KeywordInfo* Databases::getKeyword( const OUString& Database,
OUString key = processLang(Language) + "/" + Database;
std::pair< KeywordInfoTable::iterator,bool > aPair =
- m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,(KeywordInfo*)0 ) );
+ m_aKeywordInfo.insert( KeywordInfoTable::value_type( key,nullptr ) );
KeywordInfoTable::iterator it = aPair.first;
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 3db0233..2774057 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -712,7 +712,7 @@ zipOpen(SAL_UNUSED_PARAMETER const char *) {
OUString language,jar,path;
if( !ugblData->m_pInitial->get_eid().isEmpty() )
- return (void*)(new Reference< XHierarchicalNameAccess >);
+ return static_cast<void*>(new Reference< XHierarchicalNameAccess >);
else
{
jar = ugblData->m_pInitial->get_jar();
@@ -1143,8 +1143,8 @@ void InputStreamTransformer::addToBuffer( const char* buffer_,int len_ )
char* tmp = buffer;
buffer = new char[ len+len_ ];
- memcpy( (void*)(buffer),(void*)(tmp),sal_uInt32( len ) );
- memcpy( (void*)(buffer+len),(void*)(buffer_),sal_uInt32( len_ ) );
+ memcpy( static_cast<void*>(buffer),static_cast<void*>(tmp),sal_uInt32( len ) );
+ memcpy( static_cast<void*>(buffer+len),static_cast<void const *>(buffer_),sal_uInt32( len_ ) );
delete[] tmp;
len += len_;
}
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index e76fcfe..81881f8 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -171,7 +171,7 @@ Reference< XInterface > SAL_CALL
TVFactory::CreateInstance(
const Reference< XMultiServiceFactory >& xMultiServiceFactory )
{
- XServiceInfo* xP = (XServiceInfo*) new TVFactory( comphelper::getComponentContext(xMultiServiceFactory) );
+ XServiceInfo* xP = static_cast<XServiceInfo*>(new TVFactory( comphelper::getComponentContext(xMultiServiceFactory) ));
return Reference< XInterface >::query( xP );
}
commit ced1ffc2d91e0eeac14fedb94f7f31532d3e8f22
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jun 8 16:29:54 2015 +0200
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I72ba7c59cfcf0ec4e5e31067a260e82f8f604567
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 3ccf2db..98d9dea 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -130,7 +130,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL MSWorksCalcImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new MSWorksCalcImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new MSWorksCalcImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
index 5b2f3f7..752a64db 100644
--- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx
@@ -168,7 +168,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL MWAWCalcImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new MWAWCalcImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new MWAWCalcImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index e5671da..7a9c833 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -62,7 +62,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL CDRImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new CDRImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new CDRImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 2670706..9f034eb 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -62,7 +62,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL CMXImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new CMXImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new CMXImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx
index 2afe6d6..941be25 100644
--- a/writerperfect/source/draw/FreehandImportFilter.cxx
+++ b/writerperfect/source/draw/FreehandImportFilter.cxx
@@ -58,7 +58,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL FreehandImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new FreehandImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new FreehandImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index b0f5e63..6d96a0d 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -60,7 +60,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL MSPUBImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new MSPUBImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new MSPUBImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
index 85ce6d6..8b5b21a 100644
--- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx
+++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx
@@ -176,7 +176,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL MWAWDrawImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new MWAWDrawImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new MWAWDrawImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx b/writerperfect/source/draw/PageMakerImportFilter.cxx
index 915b2c2..fe69182 100644
--- a/writerperfect/source/draw/PageMakerImportFilter.cxx
+++ b/writerperfect/source/draw/PageMakerImportFilter.cxx
@@ -60,7 +60,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL PageMakerImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new PageMakerImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new PageMakerImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index bfa1cbe..923cca6 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -58,7 +58,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL VisioImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new VisioImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new VisioImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index d99572a..165c53d 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -65,7 +65,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL WPGImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new WPGImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new WPGImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx
index f4e2cba..bd51f1d 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -257,7 +257,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL KeynoteImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new KeynoteImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new KeynoteImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
index c93a9bc..1abcaf6 100644
--- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
+++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx
@@ -158,7 +158,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL MWAWPresentationImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new MWAWPresentationImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new MWAWPresentationImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/writer/AbiWordImportFilter.cxx b/writerperfect/source/writer/AbiWordImportFilter.cxx
index 11b3e18..2298d98 100644
--- a/writerperfect/source/writer/AbiWordImportFilter.cxx
+++ b/writerperfect/source/writer/AbiWordImportFilter.cxx
@@ -61,7 +61,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL AbiWordImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new AbiWordImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new AbiWordImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx
index a7db6c2..5301bdc 100644
--- a/writerperfect/source/writer/EBookImportFilter.cxx
+++ b/writerperfect/source/writer/EBookImportFilter.cxx
@@ -116,7 +116,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL EBookImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new EBookImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new EBookImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 90bb62d..35e4cb6 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -106,7 +106,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL MSWorksImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new MSWorksImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new MSWorksImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx
index 34bf04e..0f62411 100644
--- a/writerperfect/source/writer/MWAWImportFilter.cxx
+++ b/writerperfect/source/writer/MWAWImportFilter.cxx
@@ -205,7 +205,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL MWAWImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new MWAWImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new MWAWImportFilter(rContext));
}
// XServiceInfo
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index 389e5b5..cc38317 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -256,7 +256,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL WordPerfectImportFilter_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new WordPerfectImportFilter(rContext);
+ return static_cast<cppu::OWeakObject *>(new WordPerfectImportFilter(rContext));
}
// XServiceInfo
@@ -387,7 +387,7 @@ throw (RuntimeException)
Reference< XInterface > SAL_CALL WordPerfectImportFilterDialog_createInstance(const Reference< XComponentContext > &rContext)
throw(Exception)
{
- return (cppu::OWeakObject *) new WordPerfectImportFilterDialog(rContext);
+ return static_cast<cppu::OWeakObject *>(new WordPerfectImportFilterDialog(rContext));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f6ec07a3963a401dc736baa9bdd2ed3c7325bb66
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jun 8 16:29:41 2015 +0200
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I07bf1403e6b992807541a499b786d47f835b2f81
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 2d2ce8f..a04c8e1 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -99,7 +99,7 @@ struct GLWindow
}
lookHere=NULL; /* get next token */
}
- free((void*)deleteThis);
+ free(static_cast<void*>(deleteThis));
return flag;
}
diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/generic/fontmanager/parseAFM.cxx
index e642738..82cb46f 100644
--- a/vcl/generic/fontmanager/parseAFM.cxx
+++ b/vcl/generic/fontmanager/parseAFM.cxx
@@ -267,7 +267,7 @@ static char *token( FileInputStream* stream, int& rLen )
ch = stream->getChar();
}
- if (ch == -1 && idx < 1) return ((char *)NULL);
+ if (ch == -1 && idx < 1) return (nullptr);
if (idx >= 1 && ch != ':' && ch != -1) stream->ungetChar();
if (idx < 1 ) ident[idx++] = ch; /* single-character token */
ident[idx] = 0;
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index d6a2116..5688aac 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -1581,7 +1581,7 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
aFuncs.cubic_to = &FT_cubic_to;
aFuncs.shift = 0;
aFuncs.delta = 0;
- rc = FT_Outline_Decompose( &rOutline, &aFuncs, (void*)&aPolyArg );
+ rc = FT_Outline_Decompose( &rOutline, &aFuncs, static_cast<void*>(&aPolyArg) );
aPolyArg.ClosePolygon(); // close last polygon
FT_Done_Glyph( pGlyphFT );
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 8d1c6f5..43550f2 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -135,7 +135,7 @@ static hb_blob_t *getFontTable(hb_face_t* /*face*/, hb_tag_t nTableTag, void* pU
hb_blob_t* pBlob = NULL;
if (pBuffer != NULL)
- pBlob = hb_blob_create(reinterpret_cast<const char*>(pBuffer), nLength, HB_MEMORY_MODE_READONLY, (void*) pBuffer, NULL);
+ pBlob = hb_blob_create(reinterpret_cast<const char*>(pBuffer), nLength, HB_MEMORY_MODE_READONLY, const_cast<unsigned char *>(pBuffer), NULL);
return pBlob;
}
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
index 625ca7b..4b44b6b 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/generic/glyphs/scrptrun.h
@@ -88,7 +88,7 @@ public:
UBool next();
/**
- * ICU "poor man's RTTI", returns a UClassID for the actual class.
+s * ICU "poor man's RTTI", returns a UClassID for the actual class.
*
* @stable ICU 2.2
*/
@@ -99,7 +99,7 @@ public:
*
* @stable ICU 2.2
*/
- static inline UClassID getStaticClassID() { return (UClassID)&fgClassID; }
+ static inline UClassID getStaticClassID() { return static_cast<UClassID>(const_cast<char *>(&fgClassID)); }
private:
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 9d74f04..e024f08 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -45,22 +45,22 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
if( m_aJobData.m_aContext.checkConstraints( pKey, pValue ) )
{
- if( rBox.GetEntryPos( (void*)pValue ) == LISTBOX_ENTRY_NOTFOUND )
+ if( rBox.GetEntryPos( static_cast<void const *>(pValue) ) == LISTBOX_ENTRY_NOTFOUND )
{
nPos = rBox.InsertEntry( aOptionText, LISTBOX_APPEND );
- rBox.SetEntryData( nPos, (void*)pValue );
+ rBox.SetEntryData( nPos, const_cast<PPDValue *>(pValue) );
}
}
else
{
- if( ( nPos = rBox.GetEntryPos( (void*)pValue ) ) != LISTBOX_ENTRY_NOTFOUND )
+ if( ( nPos = rBox.GetEntryPos( static_cast<void const *>(pValue) ) ) != LISTBOX_ENTRY_NOTFOUND )
rBox.RemoveEntry( nPos );
}
}
pValue = m_aJobData.m_aContext.getValue( pKey );
if (pValue && !pValue->m_bCustomOption)
{
- if( ( nPos = rBox.GetEntryPos( (void*)pValue ) ) != LISTBOX_ENTRY_NOTFOUND )
+ if( ( nPos = rBox.GetEntryPos( static_cast<void const *>(pValue) ) ) != LISTBOX_ENTRY_NOTFOUND )
rBox.SelectEntryPos( nPos );
}
else
@@ -370,7 +370,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
{
OUString aEntry( m_pParent->m_aJobData.m_pParser->translateKey( pKey->getKey() ) );
sal_uInt16 nPos = m_pPPDKeyBox->InsertEntry( aEntry );
- m_pPPDKeyBox->SetEntryData( nPos, (void*)pKey );
+ m_pPPDKeyBox->SetEntryData( nPos, const_cast<PPDKey *>(pKey) );
}
}
}
@@ -485,11 +485,11 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
else
aEntry = OUString(m_pParent->m_aJobData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption));
sal_uInt16 nPos = m_pPPDValueBox->InsertEntry( aEntry );
- m_pPPDValueBox->SetEntryData( nPos, (void*)pValue );
+ m_pPPDValueBox->SetEntryData( nPos, const_cast<PPDValue *>(pValue) );
}
}
pValue = m_pParent->m_aJobData.m_aContext.getValue( pKey );
- m_pPPDValueBox->SelectEntryPos( m_pPPDValueBox->GetEntryPos( (void*)pValue ) );
+ m_pPPDValueBox->SelectEntryPos( m_pPPDValueBox->GetEntryPos( static_cast<void const *>(pValue) ) );
if (pValue->m_bCustomOption)
{
m_pCustomValue = pValue;
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/generic/print/text_gfx.cxx
index a30a2b3..6b4e10f 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/generic/print/text_gfx.cxx
@@ -701,7 +701,7 @@ PrinterGfx::writeResources( osl::File* pFile, std::list< OString >& rSuppliedFon
if (pFile->setPos(osl_Pos_Current, -1) == osl::FileBase::E_None)
{
sal_uInt64 uBytes(1);
- pFile->read((void *)(&lastchar), uBytes, uBytes);
+ pFile->read(static_cast<void *>(&lastchar), uBytes, uBytes);
}
if (lastchar != '\n')
diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx
index b5e033a..ab151d7 100644
--- a/vcl/headless/svpdummies.cxx
+++ b/vcl/headless/svpdummies.cxx
@@ -26,7 +26,7 @@
SvpSalObject::SvpSalObject()
{
// fast and easy cross-platform wiping of the data
- memset( (void *)&m_aSystemChildData, 0, sizeof( SystemEnvData ) );
+ memset( static_cast<void *>(&m_aSystemChildData), 0, sizeof( SystemEnvData ) );
m_aSystemChildData.nSize = sizeof( SystemEnvData );
}
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 362a91c..459a710 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -88,7 +88,7 @@ SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
{
// SAL_DEBUG("SvpSalFrame::SvpSalFrame: " << this);
// fast and easy cross-platform wiping of the data
- memset( (void *)&m_aSystemChildData, 0, sizeof( SystemEnvData ) );
+ memset( static_cast<void *>(&m_aSystemChildData), 0, sizeof( SystemEnvData ) );
m_aSystemChildData.nSize = sizeof( SystemEnvData );
#ifdef IOS
// Nothing
diff --git a/vcl/osx/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index 77c67a6..5300c99 100644
--- a/vcl/osx/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
@@ -32,7 +32,7 @@ bool ImageToPNG( com::sun::star::uno::Sequence<sal_Int8>& rImgData,
{
(void) eInFormat; // Really not needed? Weird.
- NSData* pData = [NSData dataWithBytesNoCopy: (void*)rImgData.getConstArray() length: rImgData.getLength() freeWhenDone: 0];
+ NSData* pData = [NSData dataWithBytesNoCopy: const_cast<sal_Int8 *>(rImgData.getConstArray()) length: rImgData.getLength() freeWhenDone: 0];
if( !pData)
return false;
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index c50f4c1..a90f917 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -149,7 +149,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
// (getter with parameter) attributeNameHereAttributeForParameter:
// (setter) setAttributeNameHereAttributeForElement:to:
-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter withGetterParameter:(BOOL)withGetterParameter {
- SEL selector = (SEL)nil;
+ SEL selector = static_cast<SEL>(nil);
NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ];
@try {
// step 1: create method name from attribute name
@@ -175,7 +175,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) {
// step 2: create selector
selector = NSSelectorFromString ( methodName );
} @catch ( id exception ) {
- selector = (SEL)nil;
+ selector = static_cast<SEL>(nil);
}
[ pool release ];
return selector;
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 8036a0f..1e15ee2 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1639,13 +1639,13 @@ private:
aInputEvent.maText = aInsertString;
aInputEvent.mnCursorPos = selRange.location;
aInputEvent.mpTextAttr = &aInputFlags[0];
- mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void *)&aInputEvent );
+ mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, static_cast<void *>(&aInputEvent) );
} else {
aInputEvent.maText.clear();
aInputEvent.mnCursorPos = 0;
aInputEvent.mnCursorFlags = 0;
aInputEvent.mpTextAttr = 0;
- mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, (void *)&aInputEvent );
+ mpFrame->CallCallback( SALEVENT_EXTTEXTINPUT, static_cast<void *>(&aInputEvent) );
mpFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, 0 );
}
mbKeyHandled= true;
@@ -1712,7 +1712,7 @@ private:
YIELD_GUARD;
SalExtTextInputPosEvent aPosEvent;
- mpFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void *)&aPosEvent );
+ mpFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, static_cast<void *>(&aPosEvent) );
NSRect rect;
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 2d8f5c5..0d6c710 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -884,7 +884,7 @@ void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rRetur
{
rReturnedBytes = 1;
rReturnedType = AsciiCString;
- return (void*)"";
+ return const_cast<char *>("");
}
// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index e200ad2..ae778fe 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -43,7 +43,7 @@ void VclComplexTextTest::testArabic()
OUString aOneTwoThree( reinterpret_cast<char const *>(pOneTwoThreeUTF8),
SAL_N_ELEMENTS( pOneTwoThreeUTF8 ) - 1,
RTL_TEXTENCODING_UTF8 );
- VclPtr<vcl::Window> pWin = VclPtr<WorkWindow>::Create( (vcl::Window *)nullptr );
+ VclPtr<vcl::Window> pWin = VclPtr<WorkWindow>::Create( static_cast<vcl::Window *>(nullptr) );
CPPUNIT_ASSERT( pWin );
OutputDevice *pOutDev = static_cast< OutputDevice * >( pWin.get() );
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 607fbd9..274da6b 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -208,7 +208,7 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg
GgoData aGgoData;
aGgoData.mpPolyPoly = &rResult;
- CGPathApply( xPath, (void*)&aGgoData, MyCGPathApplierFunc );
+ CGPathApply( xPath, static_cast<void*>(&aGgoData), MyCGPathApplierFunc );
#if 0 // TODO: does OSX ensure that the last polygon is always closed?
const CGPathElement aClosingElement = { kCGPathElementCloseSubpath, NULL };
MyCGPathApplierFunc( (void*)&aGgoData, &aClosingElement );
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 4ee39d3..a2d4364 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -960,7 +960,7 @@ bool QuartzSalBitmap::GetSystemData( BitmapSystemData& rData )
mxGraphicContext = mxGraphicContextNew;
}
- rData.rImageContext = (void *) mxGraphicContext;
+ rData.rImageContext = static_cast<void *>(mxGraphicContext);
rData.mnWidth = mnWidth;
rData.mnHeight = mnHeight;
}
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 52cf48a..6a1b18a 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -676,7 +676,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV
// use the font subsetter to get the widths
TrueTypeFont* pSftFont = NULL;
- int nRC = ::OpenTTFontBuffer( (void*)&aBuffer[0], aBuffer.size(), 0, &pSftFont);
+ int nRC = ::OpenTTFontBuffer( static_cast<void*>(&aBuffer[0]), aBuffer.size(), 0, &pSftFont);
if( nRC != SF_OK )
return;
@@ -694,7 +694,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV
{
for( int i = 0; i < nGlyphCount; ++i )
rGlyphWidths[i] = pGlyphMetrics[i].adv;
- free( (void*)pGlyphMetrics );
+ free( const_cast<TTSimpleGlyphMetrics *>(pGlyphMetrics) );
}
FontCharMapPtr pMap = mpFontData->GetFontCharMap();
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 1464f18..30f8086 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -226,7 +226,7 @@ bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile,
// prepare data for psprint's font subsetter
TrueTypeFont* pSftFont = NULL;
- int nRC = ::OpenTTFontBuffer( (void*)&aBuffer[0], aBuffer.size(), 0, &pSftFont);
+ int nRC = ::OpenTTFontBuffer( static_cast<void*>(&aBuffer[0]), aBuffer.size(), 0, &pSftFont);
if( nRC != SF_OK )
return false;
diff --git a/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx
index bba7452..82961c2 100644
--- a/vcl/source/app/dndhelp.cxx
+++ b/vcl/source/app/dndhelp.cxx
@@ -74,7 +74,7 @@ vcl::unohelper::DragAndDropWrapper::~DragAndDropWrapper()
uno::Any vcl::unohelper::DragAndDropWrapper::queryInterface( const uno::Type & rType ) throw(uno::RuntimeException, std::exception)
{
uno::Any aRet = ::cppu::queryInterface( rType,
- (static_cast< ::com::sun::star::lang::XEventListener* >( (::com::sun::star::datatransfer::dnd::XDragGestureListener*)this) ),
+ (static_cast< ::com::sun::star::lang::XEventListener* >( static_cast<com::sun::star::datatransfer::dnd::XDragGestureListener*>(this)) ),
(static_cast< ::com::sun::star::datatransfer::dnd::XDragGestureListener* >(this)),
(static_cast< ::com::sun::star::datatransfer::dnd::XDragSourceListener* >(this)),
(static_cast< ::com::sun::star::datatransfer::dnd::XDropTargetListener* >(this)) );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 97621a5..536e81b 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -675,7 +675,7 @@ void Application::RemoveKeyListener( const Link<>& rKeyListener )
bool Application::HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent )
{
// let listeners process the key event
- VclWindowEvent aEvent( pWin, nEvent, (void *) pKeyEvent );
+ VclWindowEvent aEvent( pWin, nEvent, static_cast<void *>(pKeyEvent) );
ImplSVData* pSVData = ImplGetSVData();
bool bProcessed = false;
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index f2d221d..53c90ca 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -514,17 +514,17 @@ Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMu
*/
Reference< XInterface > SalInstance::CreateClipboard( const Sequence< Any >& )
{
- return Reference< XInterface >( ( cppu::OWeakObject * )new vcl::GenericClipboard() );
+ return Reference< XInterface >( static_cast<cppu::OWeakObject *>(new vcl::GenericClipboard()) );
}
Reference< XInterface > SalInstance::CreateDragSource()
{
- return Reference< XInterface >( ( cppu::OWeakObject * )new vcl::GenericDragSource() );
+ return Reference< XInterface >( static_cast<cppu::OWeakObject *>(new vcl::GenericDragSource()) );
}
Reference< XInterface > SalInstance::CreateDropTarget()
{
- return Reference< XInterface >( ( cppu::OWeakObject * )new vcl::GenericDropTarget() );
+ return Reference< XInterface >( static_cast<cppu::OWeakObject *>(new vcl::GenericDropTarget()) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 4ba8095..096452a 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1051,7 +1051,7 @@ Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const
{
Size aSz = rPrefSize;
sal_Int32 nLeft, nTop, nRight, nBottom;
- ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
+ static_cast<vcl::Window*>(const_cast<ComboBox *>(this))->GetBorder( nLeft, nTop, nRight, nBottom );
aSz.Height() -= nTop+nBottom;
if ( !IsDropDownBox() )
{
@@ -1367,7 +1367,7 @@ void ComboBox::SetNoSelection()
Rectangle ComboBox::GetBoundingRectangle( sal_Int32 nItem ) const
{
Rectangle aRect = mpImplLB->GetMainWindow()->GetBoundingRectangle( nItem );
- Rectangle aOffset = mpImplLB->GetMainWindow()->GetWindowExtentsRelative( (vcl::Window*)this );
+ Rectangle aOffset = mpImplLB->GetMainWindow()->GetWindowExtentsRelative( static_cast<vcl::Window*>(const_cast<ComboBox *>(this)) );
aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() );
return aRect;
}
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 2cf7dfb..5736082 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3008,8 +3008,8 @@ void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth,
// The number also cannot be calculated by List/Combobox, as for
// this the presence of the vertical Scrollbar has to be known.
mpImplLB->SetSizePixel( GetOutputSizePixel() );
- ((vcl::Window*)mpImplLB)->Resize();
- ((vcl::Window*)mpImplLB->GetMainWindow())->Resize();
+ static_cast<vcl::Window*>(mpImplLB)->Resize();
+ static_cast<vcl::Window*>(mpImplLB->GetMainWindow())->Resize();
}
}
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 6944518..b476d86 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -1170,7 +1170,7 @@ bool ListBox::IsInDropDown() const
Rectangle ListBox::GetBoundingRectangle( sal_Int32 nItem ) const
{
Rectangle aRect = mpImplLB->GetMainWindow()->GetBoundingRectangle( nItem );
- Rectangle aOffset = mpImplLB->GetMainWindow()->GetWindowExtentsRelative( (vcl::Window*)this );
+ Rectangle aOffset = mpImplLB->GetMainWindow()->GetWindowExtentsRelative( static_cast<vcl::Window*>(const_cast<ListBox *>(this)) );
aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() );
return aRect;
}
@@ -1295,7 +1295,7 @@ Size ListBox::CalcAdjustedSize( const Size& rPrefSize ) const
{
Size aSz = rPrefSize;
sal_Int32 nLeft, nTop, nRight, nBottom;
- ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
+ static_cast<vcl::Window*>(const_cast<ListBox *>(this))->GetBorder( nLeft, nTop, nRight, nBottom );
aSz.Height() -= nTop+nBottom;
if ( !IsDropDownBox() )
{
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 11471c8..f4b8778 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1251,7 +1251,7 @@ Size VclMultiLineEdit::CalcMinimumSize() const
Size aSz = pImpVclMEdit->CalcMinimumSize();
sal_Int32 nLeft, nTop, nRight, nBottom;
- ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
+ static_cast<vcl::Window*>(const_cast<VclMultiLineEdit *>(this))->GetBorder( nLeft, nTop, nRight, nBottom );
aSz.Width() += nLeft+nRight;
aSz.Height() += nTop+nBottom;
@@ -1262,7 +1262,7 @@ Size VclMultiLineEdit::CalcAdjustedSize( const Size& rPrefSize ) const
{
Size aSz = rPrefSize;
sal_Int32 nLeft, nTop, nRight, nBottom;
- ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
+ static_cast<vcl::Window*>(const_cast<VclMultiLineEdit *>(this))->GetBorder( nLeft, nTop, nRight, nBottom );
// center vertically for whole lines
@@ -1283,7 +1283,7 @@ Size VclMultiLineEdit::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) c
Size aSz = pImpVclMEdit->CalcBlockSize( nColumns, nLines );
sal_Int32 nLeft, nTop, nRight, nBottom;
- ((vcl::Window*)this)->GetBorder( nLeft, nTop, nRight, nBottom );
+ static_cast<vcl::Window*>(const_cast<VclMultiLineEdit *>(this))->GetBorder( nLeft, nTop, nRight, nBottom );
aSz.Width() += nLeft+nRight;
aSz.Height() += nTop+nBottom;
return aSz;
diff --git a/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index 77706e0..a716ad7 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.cxx
@@ -307,7 +307,7 @@ bool ReadGSUB( struct _TrueTypeFont* pTTFile,
if( !aSubstVector.empty() )
{
GlyphSubstitution* pGSubstitution = new GlyphSubstitution;
- pTTFile->pGSubstitution = (void*)pGSubstitution;
+ pTTFile->pGSubstitution = static_cast<void*>(pGSubstitution);
for( subst_it = aSubstVector.begin(); subst_it != aSubstVector.end(); ++subst_it )
(*pGSubstitution)[ (*subst_it).first ] = (*subst_it).second;
}
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index 6f467b0..db3367d 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -925,7 +925,7 @@ TrueTypeTable *TrueTypeTableNew_head(sal_uInt32 fontRevision,
PutUInt16(fontDirectionHint, ptr, 48, 1);
PutUInt16(0, ptr, 52, 1); /* glyph data format: 0 */
- table->data = (void *) ptr;
+ table->data = static_cast<void *>(ptr);
table->tag = T_head;
table->rawdata = 0;
@@ -954,7 +954,7 @@ TrueTypeTable *TrueTypeTableNew_hhea(sal_Int16 ascender,
PutUInt16(0, ptr, 30, 1); /* reserved 5 */
PutUInt16(0, ptr, 32, 1); /* metricDataFormat */
- table->data = (void *) ptr;
+ table->data = static_cast<void *>(ptr);
table->tag = T_hhea;
table->rawdata = 0;
@@ -997,7 +997,7 @@ TrueTypeTable *TrueTypeTableNew_glyf()
assert(l != 0);
- listSetElementDtor(l, (list_destructor)FreeGlyphData);
+ listSetElementDtor(l, FreeGlyphData);
table->data = l;
table->rawdata = 0;
@@ -1054,7 +1054,7 @@ TrueTypeTable *TrueTypeTableNew_name(int n, NameRecord *nr)
assert(l != 0);
- listSetElementDtor(l, (list_destructor)DisposeNameRecord);
+ listSetElementDtor(l, DisposeNameRecord);
if (n != 0) {
int i;
diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index ad1b5cc..0e93985 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.cxx
@@ -51,7 +51,7 @@ AlphaMask::~AlphaMask()
AlphaMask& AlphaMask::operator=( const Bitmap& rBitmap )
{
- *(Bitmap*) this = rBitmap;
+ *static_cast<Bitmap*>(this) = rBitmap;
if( !!rBitmap )
Bitmap::Convert( BMP_CONVERSION_8BIT_GREYS );
@@ -68,7 +68,7 @@ void AlphaMask::ImplSetBitmap( const Bitmap& rBitmap )
{
SAL_WARN_IF( 8 != rBitmap.GetBitCount(), "vcl.gdi", "Bitmap should be 8bpp, not " << rBitmap.GetBitCount() << "bpp" );
SAL_WARN_IF( !rBitmap.HasGreyPalette(), "vcl.gdi", "Bitmap isn't greyscale" );
- *(Bitmap*) this = rBitmap;
+ *static_cast<Bitmap*>(this) = rBitmap;
}
Bitmap AlphaMask::GetBitmap() const
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx
index fc8b6e9..b0d99c5 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -875,7 +875,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
tools::PolyPolygon aPath;
{ // read SvtGraphicFill
- SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),StreamMode::READ);
+ SvMemoryStream aMemStm(const_cast<sal_uInt8 *>(pA->GetData()), pA->GetDataSize(),StreamMode::READ);
ReadSvtGraphicFill( aMemStm, aFilling );
}
@@ -916,7 +916,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
Polygon aPath;
{ // read SvtGraphicFill
- SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),StreamMode::READ);
+ SvMemoryStream aMemStm(const_cast<sal_uInt8 *>(pA->GetData()), pA->GetDataSize(),StreamMode::READ);
ReadSvtGraphicStroke( aMemStm, aStroke );
}
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 94be557..fcb6611 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1196,7 +1196,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
{
if ( pCommentAct->GetDataSize() )
{
- SvMemoryStream aMemStm( (void*)pCommentAct->GetData(), pCommentAct->GetDataSize(), StreamMode::READ );
+ SvMemoryStream aMemStm( const_cast<sal_uInt8 *>(pCommentAct->GetData()), pCommentAct->GetDataSize(), StreamMode::READ );
SvMemoryStream aDest;
if ( bPathStroke )
{
diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 9d7cea0b..2176ee5 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.cxx
@@ -308,7 +308,7 @@ AInfo* ImplAnimView::createAInfo() const
pAInfo->aStartOrg = maPt;
pAInfo->aStartSize = maSz;
pAInfo->pOutDev = mpOut;
- pAInfo->pViewData = (void*) this;
+ pAInfo->pViewData = const_cast<ImplAnimView *>(this);
pAInfo->nExtraData = mnExtraData;
pAInfo->bPause = mbPause;
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 887bf7f..10b0e7f 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -293,7 +293,7 @@ void MetaPixelAction::Execute( OutputDevice* pOut )
MetaAction* MetaPixelAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaPixelAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaPixelAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -348,7 +348,7 @@ void MetaPointAction::Execute( OutputDevice* pOut )
MetaAction* MetaPointAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaPointAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaPointAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -412,7 +412,7 @@ void MetaLineAction::Execute( OutputDevice* pOut )
MetaAction* MetaLineAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaLineAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaLineAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -481,7 +481,7 @@ void MetaRectAction::Execute( OutputDevice* pOut )
MetaAction* MetaRectAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaRectAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaRectAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -538,7 +538,7 @@ void MetaRoundRectAction::Execute( OutputDevice* pOut )
MetaAction* MetaRoundRectAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaRoundRectAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaRoundRectAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -595,7 +595,7 @@ void MetaEllipseAction::Execute( OutputDevice* pOut )
MetaAction* MetaEllipseAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaEllipseAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaEllipseAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -650,7 +650,7 @@ void MetaArcAction::Execute( OutputDevice* pOut )
MetaAction* MetaArcAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaArcAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaArcAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -715,7 +715,7 @@ void MetaPieAction::Execute( OutputDevice* pOut )
MetaAction* MetaPieAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaPieAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaPieAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -780,7 +780,7 @@ void MetaChordAction::Execute( OutputDevice* pOut )
MetaAction* MetaChordAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaChordAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaChordAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -851,7 +851,7 @@ void MetaPolyLineAction::Execute( OutputDevice* pOut )
MetaAction* MetaPolyLineAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaPolyLineAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaPolyLineAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -933,7 +933,7 @@ void MetaPolygonAction::Execute( OutputDevice* pOut )
MetaAction* MetaPolygonAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaPolygonAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaPolygonAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1002,7 +1002,7 @@ void MetaPolyPolygonAction::Execute( OutputDevice* pOut )
MetaAction* MetaPolyPolygonAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaPolyPolygonAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaPolyPolygonAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1115,7 +1115,7 @@ void MetaTextAction::Execute( OutputDevice* pOut )
MetaAction* MetaTextAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaTextAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTextAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1225,7 +1225,7 @@ void MetaTextArrayAction::Execute( OutputDevice* pOut )
MetaAction* MetaTextArrayAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaTextArrayAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTextArrayAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1365,7 +1365,7 @@ void MetaStretchTextAction::Execute( OutputDevice* pOut )
MetaAction* MetaStretchTextAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaStretchTextAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaStretchTextAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1443,7 +1443,7 @@ void MetaTextRectAction::Execute( OutputDevice* pOut )
MetaAction* MetaTextRectAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaTextRectAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTextRectAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1519,7 +1519,7 @@ void MetaTextLineAction::Execute( OutputDevice* pOut )
MetaAction* MetaTextLineAction::Clone()
{
- MetaAction* pClone = (MetaAction*)new MetaTextLineAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTextLineAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1598,7 +1598,7 @@ void MetaBmpAction::Execute( OutputDevice* pOut )
MetaAction* MetaBmpAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaBmpAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaBmpAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1659,7 +1659,7 @@ void MetaBmpScaleAction::Execute( OutputDevice* pOut )
MetaAction* MetaBmpScaleAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaBmpScaleAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaBmpScaleAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1729,7 +1729,7 @@ void MetaBmpScalePartAction::Execute( OutputDevice* pOut )
MetaAction* MetaBmpScalePartAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaBmpScalePartAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaBmpScalePartAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1861,7 +1861,7 @@ void MetaBmpExScaleAction::Execute( OutputDevice* pOut )
MetaAction* MetaBmpExScaleAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaBmpExScaleAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaBmpExScaleAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -1931,7 +1931,7 @@ void MetaBmpExScalePartAction::Execute( OutputDevice* pOut )
MetaAction* MetaBmpExScalePartAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaBmpExScalePartAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaBmpExScalePartAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2005,7 +2005,7 @@ void MetaMaskAction::Execute( OutputDevice* pOut )
MetaAction* MetaMaskAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaMaskAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaMaskAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2069,7 +2069,7 @@ void MetaMaskScaleAction::Execute( OutputDevice* pOut )
MetaAction* MetaMaskScaleAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaMaskScaleAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaMaskScaleAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2142,7 +2142,7 @@ void MetaMaskScalePartAction::Execute( OutputDevice* pOut )
MetaAction* MetaMaskScalePartAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaMaskScalePartAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaMaskScalePartAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2216,7 +2216,7 @@ void MetaGradientAction::Execute( OutputDevice* pOut )
MetaAction* MetaGradientAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaGradientAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaGradientAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2276,7 +2276,7 @@ void MetaGradientExAction::Execute( OutputDevice* pOut )
MetaAction* MetaGradientExAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaGradientExAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaGradientExAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2338,7 +2338,7 @@ void MetaHatchAction::Execute( OutputDevice* pOut )
MetaAction* MetaHatchAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaHatchAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaHatchAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2401,7 +2401,7 @@ void MetaWallpaperAction::Execute( OutputDevice* pOut )
MetaAction* MetaWallpaperAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaWallpaperAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaWallpaperAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2460,7 +2460,7 @@ void MetaClipRegionAction::Execute( OutputDevice* pOut )
MetaAction* MetaClipRegionAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaClipRegionAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaClipRegionAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2516,7 +2516,7 @@ void MetaISectRectClipRegionAction::Execute( OutputDevice* pOut )
MetaAction* MetaISectRectClipRegionAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaISectRectClipRegionAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaISectRectClipRegionAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2569,7 +2569,7 @@ void MetaISectRegionClipRegionAction::Execute( OutputDevice* pOut )
MetaAction* MetaISectRegionClipRegionAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaISectRegionClipRegionAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaISectRegionClipRegionAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2624,7 +2624,7 @@ void MetaMoveClipRegionAction::Execute( OutputDevice* pOut )
MetaAction* MetaMoveClipRegionAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaMoveClipRegionAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaMoveClipRegionAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2681,7 +2681,7 @@ void MetaLineColorAction::Execute( OutputDevice* pOut )
MetaAction* MetaLineColorAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaLineColorAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaLineColorAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2731,7 +2731,7 @@ void MetaFillColorAction::Execute( OutputDevice* pOut )
MetaAction* MetaFillColorAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaFillColorAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaFillColorAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2776,7 +2776,7 @@ void MetaTextColorAction::Execute( OutputDevice* pOut )
MetaAction* MetaTextColorAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaTextColorAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTextColorAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2823,7 +2823,7 @@ void MetaTextFillColorAction::Execute( OutputDevice* pOut )
MetaAction* MetaTextFillColorAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaTextFillColorAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTextFillColorAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2873,7 +2873,7 @@ void MetaTextLineColorAction::Execute( OutputDevice* pOut )
MetaAction* MetaTextLineColorAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaTextLineColorAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTextLineColorAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2923,7 +2923,7 @@ void MetaOverlineColorAction::Execute( OutputDevice* pOut )
MetaAction* MetaOverlineColorAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaOverlineColorAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaOverlineColorAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -2969,7 +2969,7 @@ void MetaTextAlignAction::Execute( OutputDevice* pOut )
MetaAction* MetaTextAlignAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaTextAlignAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTextAlignAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3013,7 +3013,7 @@ void MetaMapModeAction::Execute( OutputDevice* pOut )
MetaAction* MetaMapModeAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaMapModeAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaMapModeAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3073,7 +3073,7 @@ void MetaFontAction::Execute( OutputDevice* pOut )
MetaAction* MetaFontAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaFontAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaFontAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3130,7 +3130,7 @@ void MetaPushAction::Execute( OutputDevice* pOut )
MetaAction* MetaPushAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaPushAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaPushAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3169,7 +3169,7 @@ void MetaPopAction::Execute( OutputDevice* pOut )
MetaAction* MetaPopAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaPopAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaPopAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3206,7 +3206,7 @@ void MetaRasterOpAction::Execute( OutputDevice* pOut )
MetaAction* MetaRasterOpAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaRasterOpAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaRasterOpAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3252,7 +3252,7 @@ void MetaTransparentAction::Execute( OutputDevice* pOut )
MetaAction* MetaTransparentAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaTransparentAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTransparentAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3325,7 +3325,7 @@ void MetaFloatTransparentAction::Execute( OutputDevice* pOut )
MetaAction* MetaFloatTransparentAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaFloatTransparentAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaFloatTransparentAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3394,7 +3394,7 @@ void MetaEPSAction::Execute( OutputDevice* pOut )
MetaAction* MetaEPSAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaEPSAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaEPSAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3464,7 +3464,7 @@ void MetaRefPointAction::Execute( OutputDevice* pOut )
MetaAction* MetaRefPointAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaRefPointAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaRefPointAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3544,7 +3544,7 @@ void MetaCommentAction::Execute( OutputDevice* pOut )
MetaAction* MetaCommentAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaCommentAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaCommentAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3558,7 +3558,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
bool bPathStroke = (maComment == "XPATHSTROKE_SEQ_BEGIN");
if ( bPathStroke || maComment == "XPATHFILL_SEQ_BEGIN" )
{
- SvMemoryStream aMemStm( (void*)mpData, mnDataSize, StreamMode::READ );
+ SvMemoryStream aMemStm( static_cast<void*>(mpData), mnDataSize, StreamMode::READ );
SvMemoryStream aDest;
if ( bPathStroke )
{
@@ -3614,7 +3614,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
bool bPathStroke = (maComment == "XPATHSTROKE_SEQ_BEGIN");
if ( bPathStroke || maComment == "XPATHFILL_SEQ_BEGIN" )
{
- SvMemoryStream aMemStm( (void*)mpData, mnDataSize, StreamMode::READ );
+ SvMemoryStream aMemStm( static_cast<void*>(mpData), mnDataSize, StreamMode::READ );
SvMemoryStream aDest;
if ( bPathStroke )
{
@@ -3636,7 +3636,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
delete[] mpData;
ImplInitDynamicData( static_cast<const sal_uInt8*>( aDest.GetData() ), aDest.Tell() );
} else if( maComment == "EMF_PLUS_HEADER_INFO" ){
- SvMemoryStream aMemStm( (void*)mpData, mnDataSize, StreamMode::READ );
+ SvMemoryStream aMemStm( static_cast<void*>(mpData), mnDataSize, StreamMode::READ );
SvMemoryStream aDest;
sal_Int32 nLeft(0), nRight(0), nTop(0), nBottom(0);
@@ -3724,7 +3724,7 @@ void MetaLayoutModeAction::Execute( OutputDevice* pOut )
MetaAction* MetaLayoutModeAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaLayoutModeAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaLayoutModeAction( *this ));
pClone->ResetRefCount();
return pClone;
}
@@ -3769,7 +3769,7 @@ void MetaTextLanguageAction::Execute( OutputDevice* pOut )
MetaAction* MetaTextLanguageAction::Clone()
{
- MetaAction* pClone = (MetaAction*) new MetaTextLanguageAction( *this );
+ MetaAction* pClone = static_cast<MetaAction*>(new MetaTextLanguageAction( *this ));
pClone->ResetRefCount();
return pClone;
}
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 5bd3227..fc13cbb 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1757,7 +1757,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal
m_pCodec( NULL ),
m_pMemStream(NULL),
m_aDocDigest( rtl_digest_createMD5() ),
- m_aCipher( (rtlCipher)NULL ),
+ m_aCipher( nullptr ),
m_aDigest( NULL ),
m_nKeyLength(0),
m_nRC4KeyLength(0),
@@ -6631,7 +6631,7 @@ my_NSS_CMSAttributeArray_AddAttr(PLArenaPool *poolp, NSSCMSAttribute ***attrs, N
goto loser; /* XXX or would it be better to replace it? */
/* no, shove it in */
- if (my_NSS_CMSArray_Add(poolp, reinterpret_cast<void ***>(attrs), (void *)attr) != SECSuccess)
+ if (my_NSS_CMSArray_Add(poolp, reinterpret_cast<void ***>(attrs), static_cast<void *>(attr)) != SECSuccess)
goto loser;
PORT_ArenaUnmark(poolp, mark);
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 1bea529..9c4150f 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -550,7 +550,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
const sal_uInt8* pData = pA->GetData();
if ( pData )
{
- SvMemoryStream aMemStm( (void*)pData, pA->GetDataSize(), StreamMode::READ );
+ SvMemoryStream aMemStm( const_cast<sal_uInt8 *>(pData), pA->GetDataSize(), StreamMode::READ );
bool bSkipSequence = false;
OString sSeqEnd;
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index ef6e1ac..0c713bd 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -1315,7 +1315,7 @@ SystemWindowData OpenGLContext::generateWinData(vcl::Window* pParent, bool)
if( vi )
{
SAL_INFO("vcl.opengl", "using VisualID " << vi->visualid);
- aWinData.pVisual = (void*)(vi->visual);
+ aWinData.pVisual = static_cast<void*>(vi->visual);
}
#endif
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 718cef9..48ac373 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -430,7 +430,7 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
if ( aVDev->SetOutputSizePixel( aRect.GetSize() ) )
{
- if ( ((OutputDevice*)aVDev.get())->mpGraphics || ((OutputDevice*)aVDev.get())->AcquireGraphics() )
+ if ( static_cast<OutputDevice*>(aVDev.get())->mpGraphics || static_cast<OutputDevice*>(aVDev.get())->AcquireGraphics() )
{
if ( (nWidth > 0) && (nHeight > 0) )
{
@@ -438,7 +438,7 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const
(aRect.Left() < mnOutOffX) ? (mnOutOffX - aRect.Left()) : 0L,
(aRect.Top() < mnOutOffY) ? (mnOutOffY - aRect.Top()) : 0L,
nWidth, nHeight);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list