[Libreoffice-commits] core.git: 59 commits - avmedia/source basebmp/source basic/source bridges/source canvas/source chart2/source comphelper/source connectivity/source cppuhelper/source cppu/source cui/source dbaccess/source desktop/source editeng/source embeddedobj/source extensions/source filter/source forms/source fpicker/source framework/source helpcompiler/source hwpfilter/source i18npool/source include/comphelper include/cppu include/osl include/rtl include/svx include/tools include/uno include/vcl io/source javaunohelper/source jvmfwk/plugins jvmfwk/source l10ntools/source lotuswordpro/source mysqlc/source oox/source opencl/inc package/source pyuno/source registry/source rsc/inc rsc/source salhelper/source sal/osl sal/qa sal/rtl sal/textenc sax/qa sax/source sc/inc sc/source sdext/source sfx2/source shell/source sot/source stoc/source svl/source svtools/source svx/inc svx/source test/source toolkit/source tools/source ucb/source unoxml/source uui/source vbahelper/source vcl/generic vcl/in c vcl/qa vcl/source vcl/unx vcl/workben writerfilter/source xmloff/source xmlscript/source xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Tue Jan 20 00:07:42 PST 2015
avmedia/source/opengl/oglframegrabber.cxx | 2
avmedia/source/vlc/wrapper/SymbolLoader.hxx | 2
basebmp/source/bitmapdevice.cxx | 2
basic/source/classes/image.cxx | 12
basic/source/classes/sbunoobj.cxx | 12
basic/source/classes/sbxmod.cxx | 6
basic/source/comp/buffer.cxx | 4
basic/source/runtime/runtime.cxx | 12
basic/source/sbx/sbxarray.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx | 2
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx | 16
bridges/source/cpp_uno/shared/bridge.cxx | 16
bridges/source/cpp_uno/shared/component.cxx | 21 -
bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx | 4
bridges/source/cpp_uno/shared/unointerfaceproxy.cxx | 11
bridges/source/jni_uno/jni_bridge.cxx | 24 -
bridges/source/jni_uno/jni_data.cxx | 77 +--
bridges/source/jni_uno/jni_helper.h | 2
bridges/source/jni_uno/jni_info.cxx | 6
bridges/source/jni_uno/jni_info.h | 2
bridges/source/jni_uno/jni_java2uno.cxx | 6
bridges/source/jni_uno/jni_uno2java.cxx | 14
canvas/source/cairo/cairo_canvasbitmap.cxx | 2
canvas/source/cairo/cairo_canvashelper.cxx | 2
chart2/source/view/main/GL3DRenderer.cxx | 8
comphelper/source/misc/docpasswordhelper.cxx | 4
comphelper/source/misc/evtmethodhelper.cxx | 4
comphelper/source/misc/storagehelper.cxx | 2
connectivity/source/commontools/CommonTools.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 16
connectivity/source/drivers/dbase/dindexnode.cxx | 4
connectivity/source/drivers/evoab2/EApi.cxx | 2
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 2
connectivity/source/drivers/evoab2/NResultSet.cxx | 2
connectivity/source/drivers/evoab2/NStatement.hxx | 4
connectivity/source/drivers/firebird/Blob.cxx | 2
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 4
connectivity/source/drivers/firebird/PreparedStatement.cxx | 4
connectivity/source/drivers/firebird/ResultSet.cxx | 10
connectivity/source/drivers/firebird/Util.cxx | 2
connectivity/source/drivers/kab/KDEInit.cxx | 2
connectivity/source/drivers/mork/MNSINIParser.cxx | 4
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx | 4
connectivity/source/drivers/odbc/OConnection.cxx | 8
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 92 ++--
connectivity/source/drivers/odbc/OFunctions.cxx | 108 ++---
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 4
connectivity/source/drivers/odbc/ORealDriver.cxx | 108 ++---
connectivity/source/drivers/odbc/OResultSet.cxx | 2
connectivity/source/drivers/odbc/OResultSetMetaData.cxx | 2
connectivity/source/drivers/odbc/OStatement.cxx | 8
connectivity/source/drivers/odbc/OTools.cxx | 28 -
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 4
connectivity/source/drivers/postgresql/pq_connection.cxx | 6
connectivity/source/drivers/postgresql/pq_connection.hxx | 2
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 4
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 4
connectivity/source/inc/odbc/OFunctions.hxx | 122 ++---
cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx | 26 -
cppu/source/threadpool/current.cxx | 16
cppu/source/threadpool/threadident.cxx | 2
cppu/source/threadpool/threadpool.hxx | 2
cppu/source/typelib/static_types.cxx | 48 +-
cppu/source/typelib/typelib.cxx | 108 ++---
cppu/source/uno/EnvStack.cxx | 4
cppu/source/uno/assign.hxx | 13
cppu/source/uno/constr.hxx | 8
cppu/source/uno/copy.hxx | 44 +-
cppu/source/uno/data.cxx | 4
cppu/source/uno/destr.hxx | 12
cppu/source/uno/eq.hxx | 12
cppu/source/uno/lbenv.cxx | 34 -
cppu/source/uno/lbmap.cxx | 6
cppu/source/uno/prim.hxx | 4
cppu/source/uno/sequence.cxx | 42 +-
cppuhelper/source/implbase_ex.cxx | 4
cppuhelper/source/tdmgr.cxx | 8
cppuhelper/source/typeprovider.cxx | 2
cui/source/inc/SpellDialog.hxx | 5
cui/source/inc/autocdlg.hxx | 2
cui/source/tabpages/autocdlg.cxx | 6
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/page.cxx | 4
cui/source/tabpages/transfrm.cxx | 8
dbaccess/source/core/api/RowSet.cxx | 2
dbaccess/source/ui/dlg/odbcconfig.cxx | 6
desktop/source/app/officeipcthread.cxx | 2
desktop/source/deployment/dp_persmap.cxx | 8
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 2
desktop/source/offacc/acceptor.cxx | 5
editeng/source/rtf/svxrtf.cxx | 4
editeng/source/uno/unotext2.cxx | 2
embeddedobj/source/msole/olepersist.cxx | 6
embeddedobj/source/msole/ownview.cxx | 2
extensions/source/plugin/base/context.cxx | 4
extensions/source/plugin/base/nfuncs.cxx | 4
extensions/source/plugin/unx/npnapi.cxx | 36 -
extensions/source/plugin/unx/nppapi.cxx | 22 -
extensions/source/plugin/unx/npwrap.cxx | 4
extensions/source/plugin/unx/plugcon.cxx | 4
extensions/source/scanner/sane.cxx | 64 +--
filter/source/graphicfilter/eps/eps.cxx | 8
filter/source/graphicfilter/icgm/actimpr.cxx | 2
filter/source/graphicfilter/icgm/bundles.cxx | 10
filter/source/graphicfilter/icgm/class4.cxx | 6
filter/source/graphicfilter/icgm/class7.cxx | 30 -
filter/source/graphicfilter/icgm/outact.cxx | 4
filter/source/graphicfilter/ieps/ieps.cxx | 34 -
filter/source/graphicfilter/ipict/ipict.cxx | 4
filter/source/msfilter/escherex.cxx | 10
filter/source/msfilter/mscodec.cxx | 6
filter/source/svg/svgwriter.cxx | 2
filter/source/t602/t602filter.cxx | 4
filter/source/xsltfilter/LibXSLTTransformer.cxx | 12
forms/source/component/DatabaseForm.cxx | 2
forms/source/xforms/submission/serialization_urlencoded.cxx | 2
forms/source/xforms/submission/submission_get.cxx | 2
forms/source/xforms/xpathlib/xpathlib.cxx | 22 -
fpicker/source/office/iodlg.cxx | 6
fpicker/source/office/iodlg.hxx | 2
framework/source/fwe/classes/imagewrapper.cxx | 2
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 2
framework/source/recording/dispatchrecorder.cxx | 4
helpcompiler/source/BasCodeTagger.cxx | 10
helpcompiler/source/HelpCompiler.cxx | 44 +-
helpcompiler/source/HelpLinker.cxx | 4
helpcompiler/source/LuceneHelper.cxx | 4
hwpfilter/source/grammar.cxx | 4
hwpfilter/source/hiodev.cxx | 2
hwpfilter/source/hwpread.cxx | 2
hwpfilter/source/hwpreader.cxx | 24 -
i18npool/source/breakiterator/xdictionary.cxx | 10
i18npool/source/collator/collator_unicode.cxx | 20
i18npool/source/indexentry/indexentrysupplier_asian.cxx | 6
i18npool/source/localedata/localedata.cxx | 38 -
i18npool/source/nativenumber/nativenumbersupplier.cxx | 4
i18npool/source/textconversion/textconversion_ko.cxx | 10
i18npool/source/textconversion/textconversion_zh.cxx | 34 -
i18npool/source/transliteration/textToPronounce_zh.cxx | 2
include/comphelper/servicehelper.hxx | 2
include/cppu/Enterable.hxx | 4
include/osl/socket.hxx | 2
include/rtl/byteseq.h | 2
include/rtl/byteseq.hxx | 2
include/svx/graphctl.hxx | 4
include/svx/svdsob.hxx | 4
include/tools/solar.h | 64 +--
include/uno/environment.hxx | 2
include/uno/mapping.hxx | 6
include/vcl/opengl/OpenGLContext.hxx | 8
include/vcl/salbtype.hxx | 16
io/source/TextInputStream/TextInputStream.cxx | 2
io/source/TextOutputStream/TextOutputStream.cxx | 4
io/source/stm/odata.cxx | 49 --
javaunohelper/source/bootstrap.cxx | 4
javaunohelper/source/javaunohelper.cxx | 20
javaunohelper/source/preload.cxx | 6
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 6
jvmfwk/source/elements.cxx | 208 +++++-----
jvmfwk/source/fwkbase.cxx | 22 -
jvmfwk/source/fwkutil.cxx | 4
jvmfwk/source/libxmlutil.cxx | 2
jvmfwk/source/libxmlutil.hxx | 2
l10ntools/source/treemerge.cxx | 30 -
l10ntools/source/uimerge.cxx | 2
lotuswordpro/source/filter/lwpdrawobj.cxx | 12
lotuswordpro/source/filter/lwpgrfobj.cxx | 10
mysqlc/source/mysqlc_driver.cxx | 2
mysqlc/source/mysqlc_preparedstatement.cxx | 2
mysqlc/source/mysqlc_resultset.cxx | 2
oox/source/core/binarycodec.cxx | 10
opencl/inc/opencl_device_selection.h | 4
package/source/xstor/xstorage.hxx | 13
package/source/zipapi/Deflater.cxx | 4
package/source/zipapi/Inflater.cxx | 2
package/source/zipapi/ZipFile.cxx | 10
package/source/zipapi/ZipOutputStream.cxx | 4
package/source/zippackage/ZipPackage.cxx | 4
pyuno/source/loader/pyuno_loader.cxx | 2
pyuno/source/module/pyuno.cxx | 28 -
pyuno/source/module/pyuno_adapter.cxx | 2
pyuno/source/module/pyuno_callable.cxx | 6
pyuno/source/module/pyuno_except.cxx | 4
pyuno/source/module/pyuno_module.cxx | 11
pyuno/source/module/pyuno_runtime.cxx | 12
pyuno/source/module/pyuno_type.cxx | 6
registry/source/reflcnst.hxx | 2
registry/source/reflread.cxx | 2
rsc/inc/rscconst.hxx | 4
rsc/inc/rscrange.hxx | 12
rsc/inc/rscstr.hxx | 4
rsc/inc/rsctools.hxx | 6
rsc/source/parser/rsckey.cxx | 10
rsc/source/res/rscarray.cxx | 22 -
rsc/source/res/rscclass.cxx | 24 -
rsc/source/res/rscconst.cxx | 18
rsc/source/res/rsccont.cxx | 48 +-
rsc/source/res/rscflag.cxx | 46 +-
rsc/source/res/rscmgr.cxx | 26 -
rsc/source/res/rscrange.cxx | 72 +--
rsc/source/res/rscstr.cxx | 56 +-
rsc/source/tools/rsctools.cxx | 13
sal/osl/unx/pipe.cxx | 8
sal/osl/unx/socket.cxx | 26 -
sal/qa/osl/file/osl_File.cxx | 4
sal/qa/rtl/cipher/rtl_cipher.cxx | 4
sal/qa/rtl/digest/rtl_digest.cxx | 8
sal/rtl/alloc_global.cxx | 6
sal/rtl/bootstrap.cxx | 4
sal/rtl/byteseq.cxx | 2
sal/rtl/digest.cxx | 6
sal/rtl/logfile.cxx | 22 -
sal/rtl/random.cxx | 8
sal/rtl/strtmpl.cxx | 20
sal/rtl/uuid.cxx | 8
sal/textenc/convertbig5hkscs.cxx | 2
sal/textenc/converteuctw.cxx | 2
sal/textenc/convertgb18030.cxx | 2
sal/textenc/convertiso2022cn.cxx | 2
sal/textenc/convertiso2022jp.cxx | 2
sal/textenc/convertiso2022kr.cxx | 2
sal/textenc/tcvtutf8.cxx | 2
salhelper/source/dynload.cxx | 4
sax/qa/cppunit/parser.cxx | 2
sax/source/expatwrap/sax_expat.cxx | 4
sax/source/expatwrap/saxwriter.cxx | 22 -
sax/source/expatwrap/xml2utf.cxx | 24 -
sax/source/fastparser/fastparser.cxx | 2
sax/source/tools/fastattribs.cxx | 2
sc/inc/chgtrack.hxx | 23 -
sc/source/core/tool/callform.cxx | 46 +-
sc/source/core/tool/chgtrack.cxx | 4
sc/source/core/tool/interpr4.cxx | 12
sc/source/core/tool/interpr7.cxx | 10
sc/source/core/tool/rangelst.cxx | 6
sc/source/core/tool/rangeseq.cxx | 2
sc/source/core/tool/rechead.cxx | 2
sc/source/filter/excel/xistream.cxx | 4
sc/source/filter/inc/htmlimp.hxx | 5
sc/source/filter/inc/lotattr.hxx | 8
sc/source/filter/xml/xmlexprt.cxx | 2
sc/source/ui/attrdlg/scabstdlg.cxx | 4
sc/source/ui/attrdlg/tabpages.cxx | 2
sc/source/ui/dbgui/tpsubt.cxx | 8
sc/source/ui/docshell/docsh4.cxx | 4
sc/source/ui/docshell/servobj.cxx | 2
sc/source/ui/inc/tpsubt.hxx | 4
sc/source/ui/navipi/content.cxx | 4
sc/source/ui/view/formatsh.cxx | 4
sc/source/ui/view/printfun.cxx | 10
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 16
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4
sfx2/source/appl/app.cxx | 4
sfx2/source/appl/appinit.cxx | 2
sfx2/source/appl/appserv.cxx | 2
sfx2/source/appl/appuno.cxx | 44 +-
sfx2/source/appl/impldde.cxx | 2
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/appl/shutdowniconunx.cxx | 4
sfx2/source/bastyp/helper.cxx | 2
sfx2/source/control/unoctitm.cxx | 2
sfx2/source/doc/objmisc.cxx | 2
sfx2/source/view/viewprn.cxx | 2
shell/source/backends/gconfbe/gconfaccess.cxx | 4
sot/source/sdstor/stgdir.cxx | 18
sot/source/sdstor/ucbstorage.cxx | 2
stoc/source/corereflection/base.hxx | 12
stoc/source/corereflection/crarray.cxx | 4
stoc/source/corereflection/crcomp.cxx | 12
stoc/source/corereflection/crenum.cxx | 2
stoc/source/corereflection/criface.cxx | 20
stoc/source/invocation_adapterfactory/iafactory.cxx | 45 +-
stoc/source/javaloader/javaloader.cxx | 2
stoc/source/typeconv/convert.cxx | 20
svl/source/misc/documentlockfile.cxx | 2
svl/source/misc/sharecontrolfile.cxx | 2
svl/source/passwordcontainer/passwordcontainer.cxx | 12
svtools/source/contnr/treelistbox.cxx | 2
svtools/source/dialogs/mcvmath.hxx | 16
svtools/source/misc/svtaccessiblefactory.cxx | 4
svtools/source/misc/transfer.cxx | 4
svtools/source/svhtml/htmlkywd.cxx | 8
svtools/source/svrtf/rtfkeywd.cxx | 2
svx/inc/xpolyimp.hxx | 2
svx/source/dialog/hdft.cxx | 6
svx/source/form/dbtoolsclient.cxx | 2
svx/source/unodraw/unoshap2.cxx | 2
svx/source/unodraw/unoshap4.cxx | 2
svx/source/unodraw/unoshape.cxx | 2
svx/source/xoutdev/_xpoly.cxx | 8
test/source/diff/diff.cxx | 4
toolkit/source/awt/vclxprinter.cxx | 2
toolkit/source/awt/vclxtoolkit.cxx | 4
toolkit/source/helper/accessibilityclient.cxx | 4
toolkit/source/helper/vclunohelper.cxx | 4
tools/source/generic/poly.cxx | 16
tools/source/rc/rc.cxx | 4
tools/source/rc/resmgr.cxx | 20
tools/source/ref/errinf.cxx | 4
tools/source/ref/globname.cxx | 4
tools/source/stream/stream.cxx | 26 -
ucb/source/ucp/gio/gio_mount.cxx | 4
ucb/source/ucp/webdav-neon/NeonSession.cxx | 2
unoxml/source/dom/attr.cxx | 6
unoxml/source/dom/attributesmap.cxx | 8
unoxml/source/dom/characterdata.cxx | 34 -
unoxml/source/dom/document.cxx | 32 -
unoxml/source/dom/documentbuilder.cxx | 6
unoxml/source/dom/documenttype.cxx | 6
unoxml/source/dom/element.cxx | 68 +--
unoxml/source/dom/elementlist.cxx | 4
unoxml/source/dom/entity.cxx | 6
unoxml/source/dom/entityreference.cxx | 2
unoxml/source/dom/node.cxx | 16
unoxml/source/dom/notation.cxx | 2
unoxml/source/rdf/librdf_repository.cxx | 2
unoxml/source/xpath/xpathapi.cxx | 10
uui/source/iahndl-ssl.cxx | 2
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 4
vcl/generic/fontmanager/fontconfig.cxx | 52 +-
vcl/generic/fontmanager/fontmanager.cxx | 2
vcl/generic/fontmanager/helper.cxx | 4
vcl/generic/glyphs/gcach_ftyp.cxx | 8
vcl/generic/glyphs/gcach_ftyp.hxx | 2
vcl/generic/glyphs/gcach_layout.cxx | 2
vcl/generic/print/genpspgraphics.cxx | 12
vcl/generic/print/glyphset.cxx | 4
vcl/generic/print/psputil.cxx | 2
vcl/inc/unx/gtk/gtkdata.hxx | 10
vcl/qa/cppunit/complextext.cxx | 2
vcl/source/app/dbggui.cxx | 2
vcl/source/app/svapp.cxx | 2
vcl/source/filter/graphicfilter.cxx | 32 -
vcl/source/filter/graphicfilter2.cxx | 4
vcl/source/filter/graphicfilter_internal.hxx | 2
vcl/source/filter/igif/gifread.cxx | 2
vcl/source/filter/ixpm/xpmread.cxx | 4
vcl/source/filter/ixpm/xpmread.hxx | 2
vcl/source/filter/jpeg/Exif.cxx | 4
vcl/source/filter/jpeg/JpegReader.cxx | 14
vcl/source/filter/jpeg/JpegWriter.cxx | 12
vcl/source/filter/jpeg/jpegc.cxx | 2
vcl/source/filter/sgfbram.cxx | 32 -
vcl/source/filter/sgvmain.cxx | 28 -
vcl/source/fontsubset/cff.cxx | 2
vcl/source/fontsubset/sft.cxx | 46 +-
vcl/source/fontsubset/ttcr.cxx | 6
vcl/source/gdi/bitmap.cxx | 2
vcl/source/gdi/bitmap3.cxx | 2
vcl/source/gdi/bitmap4.cxx | 24 -
vcl/source/gdi/bmpacc.cxx | 2
vcl/source/gdi/cvtsvm.cxx | 2
vcl/source/gdi/dibtools.cxx | 14
vcl/source/gdi/embeddedfontshelper.cxx | 2
vcl/source/gdi/gdimtf.cxx | 2
vcl/source/gdi/gfxlink.cxx | 2
vcl/source/gdi/impvect.cxx | 6
vcl/source/gdi/jobset.cxx | 12
vcl/source/gdi/mapmod.cxx | 4
vcl/source/gdi/octree.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 8
vcl/source/gdi/svgdata.cxx | 2
vcl/source/opengl/OpenGLContext.cxx | 14
vcl/source/outdev/curvedshapes.cxx | 8
vcl/source/outdev/font.cxx | 2
vcl/source/outdev/line.cxx | 4
vcl/source/outdev/outdev.cxx | 2
vcl/source/outdev/polygon.cxx | 14
vcl/source/outdev/polyline.cxx | 6
vcl/source/outdev/rect.cxx | 2
vcl/source/outdev/transparent.cxx | 4
vcl/source/window/abstdlg.cxx | 4
vcl/source/window/builder.cxx | 4
vcl/source/window/syschild.cxx | 2
vcl/source/window/window.cxx | 2
vcl/source/window/window2.cxx | 4
vcl/source/window/wrkwin.cxx | 2
vcl/unx/generic/app/i18n_cb.cxx | 18
vcl/unx/generic/app/i18n_ic.cxx | 30 -
vcl/unx/generic/app/i18n_im.cxx | 2
vcl/unx/generic/app/i18n_xkb.cxx | 4
vcl/unx/generic/app/randrwrapper.cxx | 2
vcl/unx/generic/app/saldisp.cxx | 14
vcl/unx/generic/app/salinst.cxx | 6
vcl/unx/generic/app/sm.cxx | 2
vcl/unx/generic/app/wmadaptor.cxx | 58 +-
vcl/unx/generic/desktopdetect/desktopdetector.cxx | 2
vcl/unx/generic/dtrans/X11_selection.cxx | 72 +--
vcl/unx/generic/dtrans/X11_transferable.cxx | 4
vcl/unx/generic/gdi/gdiimpl.cxx | 8
vcl/unx/generic/gdi/salbmp.cxx | 4
vcl/unx/generic/plugadapt/salplug.cxx | 6
vcl/unx/generic/window/FWS.cxx | 8
vcl/unx/generic/window/salframe.cxx | 26 -
vcl/unx/gtk/a11y/atkfactory.cxx | 4
vcl/unx/gtk/a11y/atkhypertext.cxx | 8
vcl/unx/gtk/a11y/atklistener.cxx | 2
vcl/unx/gtk/a11y/atktextattributes.cxx | 2
vcl/unx/gtk/a11y/atkutil.cxx | 7
vcl/unx/gtk/a11y/atkwindow.cxx | 2
vcl/unx/gtk/a11y/atkwrapper.cxx | 22 -
vcl/unx/gtk/app/gtkdata.cxx | 12
vcl/unx/gtk/app/gtksys.cxx | 4
vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 4
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2
vcl/unx/gtk/window/glomenu.cxx | 4
vcl/unx/gtk/window/gtksalframe.cxx | 16
vcl/unx/gtk/window/gtksalmenu.cxx | 2
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 2
vcl/workben/svpclient.cxx | 2
writerfilter/source/dmapper/DomainMapper.cxx | 4
writerfilter/source/dmapper/LoggedResources.cxx | 4
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 18
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
xmloff/source/style/impastpl.cxx | 2
xmlscript/source/xml_helper/xml_byteseq.cxx | 4
xmlsecurity/source/helper/xsecsign.cxx | 2
xmlsecurity/source/xmlsec/biginteger.cxx | 6
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx | 8
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 6
xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx | 10
xmlsecurity/source/xmlsec/saxhelper.cxx | 4
xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 40 -
424 files changed, 2362 insertions(+), 2376 deletions(-)
New commits:
commit be06f3433ff7a92eba2f35f2f9764131e874450c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 19 15:12:50 2015 +0100
Some more loplugin:cstylecast: xmlscript
Change-Id: I6c13ff51c32e0fded35d8f9124981fee1cce80ad
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index b9dd1ca..9e88ff9 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -122,8 +122,8 @@ void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData )
{
sal_Int32 nPos = _seq->getLength();
_seq->realloc( nPos + rData.getLength() );
- memcpy( (char *)_seq->getArray() + nPos,
- (char const *)rData.getConstArray(),
+ memcpy( _seq->getArray() + nPos,
+ rData.getConstArray(),
rData.getLength() );
}
void BSeqOutputStream::flush()
commit 2880dfe3012776e49a47e2e1b6e4bcfa1636be17
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 19 15:12:02 2015 +0100
Some more loplugin:cstylecast: xmlsecurity
Change-Id: Iceaeefc26fec2643d3fbb916ab7719a918beb496
diff --git a/xmlsecurity/source/helper/xsecsign.cxx b/xmlsecurity/source/helper/xsecsign.cxx
index ad706b0..cfa312e 100644
--- a/xmlsecurity/source/helper/xsecsign.cxx
+++ b/xmlsecurity/source/helper/xsecsign.cxx
@@ -44,7 +44,7 @@ namespace cssxs = com::sun::star::xml::sax;
OUString XSecController::createId()
{
cssu::Sequence< sal_Int8 > aSeq( 16 );
- rtl_createUuid ((sal_uInt8 *)aSeq.getArray(), 0, sal_True);
+ rtl_createUuid (reinterpret_cast<sal_uInt8 *>(aSeq.getArray()), 0, sal_True);
char str[68]="ID_";
int length = 3;
diff --git a/xmlsecurity/source/xmlsec/biginteger.cxx b/xmlsecurity/source/xmlsec/biginteger.cxx
index 567d206..e79bc51 100644
--- a/xmlsecurity/source/xmlsec/biginteger.cxx
+++ b/xmlsecurity/source/xmlsec/biginteger.cxx
@@ -36,7 +36,7 @@ Sequence< sal_Int8 > numericStringToBigInteger ( const OUString& numeral )
OString onumeral = OUStringToOString( numeral , RTL_TEXTENCODING_ASCII_US ) ;
- chNumeral = xmlStrndup( ( const xmlChar* )onumeral.getStr(), ( int )onumeral.getLength() ) ;
+ chNumeral = xmlStrndup( reinterpret_cast<const xmlChar*>(onumeral.getStr()), ( int )onumeral.getLength() ) ;
if( xmlSecBnInitialize( &bn, 0 ) < 0 ) {
xmlFree( chNumeral ) ;
@@ -87,7 +87,7 @@ OUString bigIntegerToNumericString ( const Sequence< sal_Int8 >& integer )
if( xmlSecBnInitialize( &bn, 0 ) < 0 )
return aRet ;
- if( xmlSecBnSetData( &bn, ( const unsigned char* )&integer[0], integer.getLength() ) < 0 ) {
+ if( xmlSecBnSetData( &bn, reinterpret_cast<const unsigned char*>(integer.getConstArray()), integer.getLength() ) < 0 ) {
xmlSecBnFinalize( &bn ) ;
return aRet ;
}
@@ -98,7 +98,7 @@ OUString bigIntegerToNumericString ( const Sequence< sal_Int8 >& integer )
return aRet ;
}
- aRet = OUString::createFromAscii( ( const char* )chNumeral ) ;
+ aRet = OUString::createFromAscii( reinterpret_cast<char*>(chNumeral) ) ;
xmlSecBnFinalize( &bn ) ;
xmlFree( chNumeral ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index aca47a2..c8b061a 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -89,7 +89,7 @@ namespace {
SECItem item;
item.type = siDERCertBuffer;
- item.data = (unsigned char*) m_xExtnValue.getArray();
+ item.data = reinterpret_cast<unsigned char*>(m_xExtnValue.getArray());
item.len = m_xExtnValue.getLength();
PRArenaPool *arena;
@@ -123,11 +123,11 @@ namespace {
}
case certRFC822Name:
arrCertAltNameEntry[i].Type = ExtAltNameType_RFC822_NAME;
- arrCertAltNameEntry[i].Value <<= OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US);
+ arrCertAltNameEntry[i].Value <<= OUString(reinterpret_cast<char*>(current->name.other.data), current->name.other.len, RTL_TEXTENCODING_ASCII_US);
break;
case certDNSName:
arrCertAltNameEntry[i].Type = ExtAltNameType_DNS_NAME;
- arrCertAltNameEntry[i].Value <<= OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US);
+ arrCertAltNameEntry[i].Value <<= OUString(reinterpret_cast<char*>(current->name.other.data), current->name.other.len, RTL_TEXTENCODING_ASCII_US);
break;
case certX400Address: {
// unsupported
@@ -146,7 +146,7 @@ namespace {
}
case certURI:
arrCertAltNameEntry[i].Type = ExtAltNameType_URL;
- arrCertAltNameEntry[i].Value <<= OUString((const sal_Char*)current->name.other.data, current->name.other.len, RTL_TEXTENCODING_ASCII_US);
+ arrCertAltNameEntry[i].Value <<= OUString(reinterpret_cast<char*>(current->name.other.data), current->name.other.len, RTL_TEXTENCODING_ASCII_US);
break;
case certIPAddress: {
arrCertAltNameEntry[i].Type = ExtAltNameType_IP_ADDRESS;
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index b4ea4ad..7ee8754 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -557,7 +557,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: getCertificate( const O
issuerAndSN.derIssuer.data = derIssuer->data ;
issuerAndSN.derIssuer.len = derIssuer->len ;
- issuerAndSN.serialNumber.data = ( unsigned char* )&serialNumber[0] ;
+ issuerAndSN.serialNumber.data = reinterpret_cast<unsigned char *>(const_cast<sal_Int8 *>(serialNumber.getConstArray()));
issuerAndSN.serialNumber.len = serialNumber.getLength() ;
cert = CERT_FindCertByIssuerAndSN( m_pHandler, &issuerAndSN ) ;
@@ -659,7 +659,7 @@ Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromRa
Reference< XCertificate > SecurityEnvironment_NssImpl :: createCertificateFromAscii( const OUString& asciiCertificate ) throw( SecurityException , RuntimeException, std::exception )
{
OString oscert = OUStringToOString( asciiCertificate , RTL_TEXTENCODING_ASCII_US ) ;
- xmlChar* chCert = xmlStrndup( ( const xmlChar* )oscert.getStr(), ( int )oscert.getLength() ) ;
+ xmlChar* chCert = xmlStrndup( reinterpret_cast<const xmlChar*>(oscert.getStr()), ( int )oscert.getLength() ) ;
int certSize = xmlSecBase64Decode( chCert, ( xmlSecByte* )chCert, xmlStrlen( chCert ) ) ;
if (certSize > 0)
{
@@ -714,7 +714,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
Sequence<sal_Int8> der = intermediateCerts[i]->getEncoded();
SECItem item;
item.type = siBuffer;
- item.data = (unsigned char*)der.getArray();
+ item.data = reinterpret_cast<unsigned char*>(der.getArray());
item.len = der.getLength();
CERTCertificate* certTmp = CERT_NewTempCertificate(certDb, &item,
diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
index decda16..c2c7371 100644
--- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx
@@ -197,7 +197,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun
objID = oidString;
if ( objID.equals("2.5.29.17") )
- pExtn = (CertificateExtension_XmlSecImpl*) new SanExtensionImpl() ;
+ pExtn = reinterpret_cast<CertificateExtension_XmlSecImpl*>(new SanExtensionImpl());
else
pExtn = new CertificateExtension_XmlSecImpl() ;
@@ -205,7 +205,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun
crit = false ;
else
crit = ( (*extns)->critical.data[0] == 0xFF ) ? sal_True : sal_False ;
- pExtn->setCertExtn( (*extns)->value.data, (*extns)->value.len, (unsigned char*)objID.getStr(), objID.getLength(), crit ) ;
+ pExtn->setCertExtn( (*extns)->value.data, (*extns)->value.len, reinterpret_cast<unsigned char *>(const_cast<char *>(objID.getStr())), objID.getLength(), crit ) ;
xExtns[len] = pExtn ;
}
@@ -223,7 +223,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun
SECItem idItem ;
bool crit ;
- idItem.data = ( unsigned char* )&oid[0] ;
+ idItem.data = reinterpret_cast<unsigned char *>(const_cast<sal_Int8 *>(oid.getConstArray()));
idItem.len = oid.getLength() ;
pExtn = NULL ;
@@ -232,7 +232,7 @@ OUString SAL_CALL X509Certificate_NssImpl :: getSubjectName() throw ( ::com::sun
const SECItem id = (*extns)->id;
OString objId(CERT_GetOidString(&id));
if ( objId.equals("OID.2.5.29.17") )
- pExtn = (CertificateExtension_XmlSecImpl*) new SanExtensionImpl() ;
+ pExtn = reinterpret_cast<CertificateExtension_XmlSecImpl*>(new SanExtensionImpl());
else
pExtn = new CertificateExtension_XmlSecImpl() ;
if( (*extns)->critical.data == NULL )
@@ -288,7 +288,7 @@ void X509Certificate_NssImpl :: setRawCert( const Sequence< sal_Int8 >& rawCert
CERTCertificate* cert ;
SECItem certItem ;
- certItem.data = ( unsigned char* )&rawCert[0] ;
+ certItem.data = reinterpret_cast<unsigned char *>(const_cast<sal_Int8 *>(rawCert.getConstArray()));
certItem.len = rawCert.getLength() ;
cert = CERT_DecodeDERCertificate( &certItem, PR_TRUE, NULL ) ;
diff --git a/xmlsecurity/source/xmlsec/saxhelper.cxx b/xmlsecurity/source/xmlsec/saxhelper.cxx
index 86d5dba..9c454a3 100644
--- a/xmlsecurity/source/xmlsec/saxhelper.cxx
+++ b/xmlsecurity/source/xmlsec/saxhelper.cxx
@@ -38,7 +38,7 @@ namespace cssxcsax = com::sun::star::xml::csax;
xmlChar* ous_to_xmlstr( const OUString& oustr )
{
OString ostr = OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ;
- return xmlStrndup( ( xmlChar* )ostr.getStr(), ( int )ostr.getLength() ) ;
+ return xmlStrndup( reinterpret_cast<xmlChar const *>(ostr.getStr()), ( int )ostr.getLength() ) ;
}
/**
@@ -50,7 +50,7 @@ xmlChar* ous_to_nxmlstr( const OUString& oustr, int& length )
OString ostr = OUStringToOString( oustr , RTL_TEXTENCODING_UTF8 ) ;
length = ostr.getLength();
- return xmlStrndup( ( xmlChar* )ostr.getStr(), length ) ;
+ return xmlStrndup( reinterpret_cast<xmlChar const *>(ostr.getStr()), length ) ;
}
/**
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 658fce0..4f37d71 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -228,15 +228,15 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
{
pAttributeList->AddAttribute(
OUString(C2U( STRXMLNS )),
- OUString(C2U( (sal_Char*)pNsHref )));
+ OUString(C2U( reinterpret_cast<char const *>(pNsHref) )));
}
else
{
pAttributeList->AddAttribute(
OUString(C2U( STRXMLNS ))
+OUString(C2U( ":" ))
- +OUString(C2U( (sal_Char*)pNsPrefix )),
- OUString(C2U( (sal_Char*)pNsHref )));
+ +OUString(C2U( reinterpret_cast<char const *>(pNsPrefix) )),
+ OUString(C2U( reinterpret_cast<char const *>(pNsHref) )));
}
pNsDef = pNsDef->next;
@@ -252,17 +252,17 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
OUString ouAttrName;
if (pAttrNs == NULL)
{
- ouAttrName = OUString(C2U( (sal_Char*)pAttrName ));
+ ouAttrName = OUString(C2U( reinterpret_cast<char const *>(pAttrName) ));
}
else
{
- ouAttrName = OUString(C2U( (sal_Char*)pAttrNs->prefix))
- + ":" + OUString(C2U( (sal_Char*)pAttrName ));
+ ouAttrName = OUString(C2U( reinterpret_cast<char const *>(pAttrNs->prefix)))
+ + ":" + OUString(C2U( reinterpret_cast<char const *>(pAttrName) ));
}
pAttributeList->AddAttribute(
ouAttrName,
- OUString(C2U( (sal_Char*)(pAttr->children->content))));
+ OUString(C2U( reinterpret_cast<char*>(pAttr->children->content))));
pAttr = pAttr->next;
}
@@ -368,23 +368,23 @@ void XMLDocumentWrapper_XmlSecImpl::sendNode(
{
if (xHandler.is())
{
- xHandler->characters(OUString(C2U ( ((sal_Char*)(pNode->content)) )));
+ xHandler->characters(OUString(C2U ( reinterpret_cast<char*>(pNode->content) )));
}
- xHandler2->characters(OUString(C2U ( ((sal_Char*)(pNode->content)) )));
+ xHandler2->characters(OUString(C2U ( reinterpret_cast<char*>(pNode->content) )));
}
else if (type == XML_PI_NODE)
{
if (xHandler.is())
{
xHandler->processingInstruction(
- OUString(C2U ( ((sal_Char*)(pNode->name)) )),
- OUString(C2U ( ((sal_Char*)(pNode->content)) )));
+ OUString(C2U ( reinterpret_cast<char const *>(pNode->name) )),
+ OUString(C2U ( reinterpret_cast<char const *>(pNode->content) )));
}
xHandler2->processingInstruction(
- OUString(C2U ( ((sal_Char*)(pNode->name)) )),
- OUString(C2U ( ((sal_Char*)(pNode->content)) )));
+ OUString(C2U ( reinterpret_cast<char const *>(pNode->name) )),
+ OUString(C2U ( reinterpret_cast<char*>(pNode->content) )));
}
}
@@ -411,14 +411,14 @@ OString XMLDocumentWrapper_XmlSecImpl::getNodeQName(const xmlNodePtr pNode) cons
* Email: michael.mi at sun.com
******************************************************************************/
{
- OString sNodeName((const sal_Char*)pNode->name);
+ OString sNodeName(reinterpret_cast<const char*>(pNode->name));
if (pNode->ns != NULL)
{
xmlNsPtr pNs = pNode->ns;
if (pNs->prefix != NULL)
{
- OString sPrefix((const sal_Char*)pNs->prefix);
+ OString sPrefix(reinterpret_cast<const char*>(pNs->prefix));
sNodeName = sPrefix+OString(":")+sNodeName;
}
}
@@ -636,7 +636,7 @@ void XMLDocumentWrapper_XmlSecImpl::removeNode(const xmlNodePtr pNode) const
while (pAttr != NULL)
{
- if (!stricmp((sal_Char*)pAttr->name,"id"))
+ if (!stricmp(reinterpret_cast<char const *>(pAttr->name), "id"))
{
xmlRemoveID(m_pDocument, pAttr);
}
@@ -671,10 +671,10 @@ void XMLDocumentWrapper_XmlSecImpl::buildIDAttr(xmlNodePtr pNode) const
* Email: michael.mi at sun.com
******************************************************************************/
{
- xmlAttrPtr idAttr = xmlHasProp( pNode, (const unsigned char *)"id" );
+ xmlAttrPtr idAttr = xmlHasProp( pNode, reinterpret_cast<const unsigned char *>("id") );
if (idAttr == NULL)
{
- idAttr = xmlHasProp( pNode, (const unsigned char *)"Id" );
+ idAttr = xmlHasProp( pNode, reinterpret_cast<const unsigned char *>("Id") );
}
if (idAttr != NULL)
@@ -751,7 +751,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement( )
saxHelper.endElement(
OUString(
C2U (
- (sal_Char*)(pOldCurrentElement->name)
+ reinterpret_cast<char const *>(pOldCurrentElement->name)
)));
m_pCurrentElement = saxHelper.getCurrentNode();
@@ -785,7 +785,7 @@ OUString SAL_CALL XMLDocumentWrapper_XmlSecImpl::getNodeName( const cssu::Refere
throw (cssu::RuntimeException, std::exception)
{
xmlNodePtr pNode = checkElement(node);
- return OUString(C2U ( (sal_Char*)pNode->name ));
+ return OUString(C2U ( reinterpret_cast<char const *>(pNode->name) ));
}
void SAL_CALL XMLDocumentWrapper_XmlSecImpl::clearUselessData(
commit b388b9fc48ee0e92dfffef910f141a2ee338c413
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 19 15:11:32 2015 +0100
Some more loplugin:cstylecast: xmloff
Change-Id: I45cb9467c618eed929c84656a26293c8d6087378
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 5a54f78..3147eda 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -78,7 +78,7 @@ struct2string(void *data,
result.append("{");
const typelib_CompoundTypeDescription *compoundType =
- &((const typelib_StructTypeDescription*) type)->aBase;
+ &reinterpret_cast<const typelib_StructTypeDescription*>(type)->aBase;
for (int i = 0; i < compoundType->nMembers; i++)
{
commit bf50bd977288333aa77b25d59eaf92c0b604e3c3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 19 15:10:31 2015 +0100
Some more loplugin:cstylecast: writerfilter
Change-Id: Ic8e24c5a956424883856d99fe94527cc1dff5797
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 461c138..223e3f1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2822,7 +2822,7 @@ void DomainMapper::lcl_endCharacterGroup()
void DomainMapper::lcl_text(const sal_uInt8 * data_, size_t len)
{
//TODO: Determine the right text encoding (FIB?)
- OUString sText( (const sal_Char*) data_, len, RTL_TEXTENCODING_MS_1252 );
+ OUString sText( reinterpret_cast<const char*>(data_), len, RTL_TEXTENCODING_MS_1252 );
#ifdef DEBUG_WRITERFILTER
dmapper_logger->startElement("text");
dmapper_logger->chars(sText);
@@ -2945,7 +2945,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len)
{
OUString sText;
OUStringBuffer aBuffer = OUStringBuffer(len);
- aBuffer.append( (const sal_Unicode *) data_, len);
+ aBuffer.append( reinterpret_cast<const sal_Unicode *>(data_), len);
sText = aBuffer.makeStringAndClear();
if (m_pImpl->isSdtEndDeferred())
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx
index 9f430a4..da058be 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -167,7 +167,7 @@ void LoggedStream::text(const sal_uInt8 * data, size_t len)
#ifdef DEBUG_WRITERFILTER
mHelper.startElement("text");
- OUString sText( (const sal_Char*) data, len, RTL_TEXTENCODING_MS_1252 );
+ OUString sText( reinterpret_cast<const char*>(data), len, RTL_TEXTENCODING_MS_1252 );
mHelper.startElement("data");
mHelper.chars(sText);
@@ -189,7 +189,7 @@ void LoggedStream::utext(const sal_uInt8 * data, size_t len)
OUString sText;
OUStringBuffer aBuffer = OUStringBuffer(len);
- aBuffer.append( (const sal_Unicode *) data, len);
+ aBuffer.append( reinterpret_cast<const sal_Unicode *>(data), len);
sText = aBuffer.makeStringAndClear();
mHelper.chars(sText);
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index cbe6af5..9a56d0b 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -560,13 +560,13 @@ void OOXMLFastContextHandler::lockField()
void OOXMLFastContextHandler::ftnednref()
{
if (isForwardEvents())
- mpStream->utext((const sal_uInt8*)&uFtnEdnRef, 1);
+ mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uFtnEdnRef), 1);
}
void OOXMLFastContextHandler::ftnednsep()
{
if (isForwardEvents())
- mpStream->utext((const sal_uInt8*)&uFtnEdnSep, 1);
+ mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uFtnEdnSep), 1);
}
void OOXMLFastContextHandler::ftnedncont()
@@ -578,31 +578,31 @@ void OOXMLFastContextHandler::ftnedncont()
void OOXMLFastContextHandler::pgNum()
{
if (isForwardEvents())
- mpStream->utext((const sal_uInt8*)&uPgNum, 1);
+ mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uPgNum), 1);
}
void OOXMLFastContextHandler::tab()
{
if (isForwardEvents())
- mpStream->utext((const sal_uInt8*)&uTab, 1);
+ mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uTab), 1);
}
void OOXMLFastContextHandler::cr()
{
if (isForwardEvents())
- mpStream->utext((const sal_uInt8*)&uCR, 1);
+ mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uCR), 1);
}
void OOXMLFastContextHandler::noBreakHyphen()
{
if (isForwardEvents())
- mpStream->utext((const sal_uInt8*)&uNoBreakHyphen, 1);
+ mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uNoBreakHyphen), 1);
}
void OOXMLFastContextHandler::softHyphen()
{
if (isForwardEvents())
- mpStream->utext((const sal_uInt8*)&uSoftHyphen, 1);
+ mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uSoftHyphen), 1);
}
void OOXMLFastContextHandler::handleLastParagraphInSection()
@@ -619,7 +619,7 @@ void OOXMLFastContextHandler::endOfParagraph()
if (! mpParserState->isInCharacterGroup())
startCharacterGroup();
if (isForwardEvents())
- mpStream->utext((const sal_uInt8*)&uCR, 1);
+ mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uCR), 1);
mpParserState->getDocument()->incrementProgress();
}
@@ -1423,7 +1423,7 @@ void OOXMLFastContextHandlerTextTableRow::endRow()
startCharacterGroup();
if (isForwardEvents())
- mpStream->utext((const sal_uInt8*)&uCR, 1);
+ mpStream->utext(reinterpret_cast<const sal_uInt8*>(&uCR), 1);
endCharacterGroup();
endParagraphGroup();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 3119040..5ef3834 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2377,7 +2377,7 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
case RTF_CHFTNSEP:
{
static const sal_Unicode uFtnEdnSep = 0x3;
- Mapper().utext((const sal_uInt8*)&uFtnEdnSep, 1);
+ Mapper().utext(reinterpret_cast<const sal_uInt8*>(&uFtnEdnSep), 1);
}
break;
default:
commit fe9d002ef55e30aa3629f4e1951beb18ebb692b0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Jan 19 15:10:10 2015 +0100
Some more loplugin:cstylecast: vcl
Change-Id: I74d35630b9fcdaa97af0b1f1e6d1e5c72488964d
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 5ef30cd..18fc710 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -77,18 +77,18 @@ struct GLWindow
return GL_FALSE;
}
- deleteThis=lookHere=(char*)malloc(strlen((const char*)extString)+1);
+ deleteThis=lookHere=(char*)malloc(strlen(reinterpret_cast<const char*>(extString))+1);
if (lookHere==NULL)
{
return GL_FALSE;
}
/* strtok() will modify string, so copy it somewhere */
- strcpy(lookHere,(const char*)extString);
+ strcpy(lookHere, reinterpret_cast<const char*>(extString));
while ((word=strtok(lookHere, " "))!=NULL)
{
- if (strcmp(word,(const char*)extName)==0)
+ if (strcmp(word, reinterpret_cast<const char*>(extName))==0)
{
flag=GL_TRUE;
break;
@@ -119,7 +119,7 @@ struct GLWindow
GLXContext ctx;
GLXPixmap glPix;
- bool HasGLXExtension( const char* name ) { return checkExtension( (const GLubyte*) name, (const GLubyte*) GLXExtensions ); }
+ bool HasGLXExtension( const char* name ) { return checkExtension( reinterpret_cast<const GLubyte*>(name), reinterpret_cast<const GLubyte*>(GLXExtensions) ); }
const char* GLXExtensions;
#endif
unsigned int bpp;
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 970d319..40dfd8f 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -471,7 +471,7 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) :
if( mnCount )
{
const sal_uLong nSize = mnCount * sizeof( BitmapColor );
- mpBitmapColor = (BitmapColor*) new sal_uInt8[ nSize ];
+ mpBitmapColor = reinterpret_cast<BitmapColor*>(new sal_uInt8[ nSize ]);
memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize );
}
else
@@ -484,7 +484,7 @@ inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) :
if( mnCount )
{
const sal_uLong nSize = mnCount * sizeof( BitmapColor );
- mpBitmapColor = (BitmapColor*) new sal_uInt8[ nSize ];
+ mpBitmapColor = reinterpret_cast<BitmapColor*>(new sal_uInt8[ nSize ]);
memset( mpBitmapColor, 0, nSize );
}
else
@@ -493,18 +493,18 @@ inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) :
inline BitmapPalette::~BitmapPalette()
{
- delete[] (sal_uInt8*) mpBitmapColor;
+ delete[] reinterpret_cast<sal_uInt8*>(mpBitmapColor);
}
inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPalette )
{
- delete[] (sal_uInt8*) mpBitmapColor;
+ delete[] reinterpret_cast<sal_uInt8*>(mpBitmapColor);
mnCount = rBitmapPalette.mnCount;
if( mnCount )
{
const sal_uLong nSize = mnCount * sizeof( BitmapColor );
- mpBitmapColor = (BitmapColor*) new sal_uInt8[ nSize ];
+ mpBitmapColor = reinterpret_cast<BitmapColor*>(new sal_uInt8[ nSize ]);
memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize );
}
else
@@ -553,7 +553,7 @@ inline void BitmapPalette::SetEntryCount( sal_uInt16 nCount )
{
if( !nCount )
{
- delete[] (sal_uInt8*) mpBitmapColor;
+ delete[] reinterpret_cast<sal_uInt8*>(mpBitmapColor);
mpBitmapColor = NULL;
mnCount = 0;
}
@@ -565,9 +565,9 @@ inline void BitmapPalette::SetEntryCount( sal_uInt16 nCount )
if ( nMinSize && mpBitmapColor )
memcpy( pNewColor, mpBitmapColor, nMinSize );
- delete[] (sal_uInt8*) mpBitmapColor;
+ delete[] reinterpret_cast<sal_uInt8*>(mpBitmapColor);
memset( pNewColor + nMinSize, 0, nNewSize - nMinSize );
- mpBitmapColor = (BitmapColor*) pNewColor;
+ mpBitmapColor = reinterpret_cast<BitmapColor*>(pNewColor);
mnCount = nCount;
}
}
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 839a722..edc6035 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -137,7 +137,7 @@ namespace
bool nHaveB = FcPatternGetString(b, FC_FAMILY, 0, &pNameB) == FcResultMatch;
if (nHaveA && nHaveB)
- return strcmp((const char*)pNameA, (const char*)pNameB);
+ return strcmp(reinterpret_cast<const char*>(pNameA), reinterpret_cast<const char*>(pNameB));
return int(nHaveA) - int(nHaveB);
}
@@ -275,7 +275,7 @@ namespace
bool found_fallback_englishname = false;
for( std::vector<lang_and_element>::const_iterator aIter = elements.begin(); aIter != aEnd; ++aIter )
{
- const char *pLang = (const char*)aIter->first;
+ const char *pLang = reinterpret_cast<const char*>(aIter->first);
if( rtl_str_compare( pLang, sFullMatch.getStr() ) == 0)
{
// both language and country match
@@ -319,12 +319,12 @@ void FontCfgWrapper::cacheLocalizedFontNames(const FcChar8 *origfontname, const
std::vector<lang_and_element>::const_iterator aEnd = lang_and_elements.end();
for (std::vector<lang_and_element>::const_iterator aIter = lang_and_elements.begin(); aIter != aEnd; ++aIter)
{
- const char *candidate = (const char*)(aIter->second);
- if (rtl_str_compare(candidate, (const char*)bestfontname) != 0)
- m_aFontNameToLocalized[OString(candidate)] = OString((const char*)bestfontname);
+ const char *candidate = reinterpret_cast<const char*>(aIter->second);
+ if (rtl_str_compare(candidate, reinterpret_cast<const char*>(bestfontname)) != 0)
+ m_aFontNameToLocalized[OString(candidate)] = OString(reinterpret_cast<const char*>(bestfontname));
}
- if (rtl_str_compare((const char*)origfontname, (const char*)bestfontname) != 0)
- m_aLocalizedToCanonical[OString((const char*)bestfontname)] = OString((const char*)origfontname);
+ if (rtl_str_compare(reinterpret_cast<const char*>(origfontname), reinterpret_cast<const char*>(bestfontname)) != 0)
+ m_aLocalizedToCanonical[OString(reinterpret_cast<const char*>(bestfontname))] = OString(reinterpret_cast<const char*>(origfontname));
}
FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **element,
@@ -544,7 +544,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OS
// see if this font is already cached
// update attributes
std::list< PrintFont* > aFonts;
- OString aDir, aBase, aOrgPath( (sal_Char*)file );
+ OString aDir, aBase, aOrgPath( reinterpret_cast<char*>(file) );
splitPath( aOrgPath, aDir, aBase );
o_rVisitedPaths[aDir] = 1;
@@ -559,7 +559,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OS
// not described by fontconfig (e.g. alias names, PSName)
if (eFormatRes != FcResultMatch)
format = NULL;
- analyzeFontFile( nDirID, aBase, aFonts, (const char*)format );
+ analyzeFontFile( nDirID, aBase, aFonts, reinterpret_cast<char*>(format) );
#if OSL_DEBUG_LEVEL > 1
if( aFonts.empty() )
fprintf( stderr, "Warning: file \"%s\" is unusable to psprint\n", aOrgPath.getStr() );
@@ -577,7 +577,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OS
continue;
}
- int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), RTL_TEXTENCODING_UTF8 ), true );
+ int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( reinterpret_cast<char*>(family) ), RTL_TEXTENCODING_UTF8 ), true );
PrintFont* pUpdate = aFonts.front();
std::list<PrintFont*>::const_iterator second_font = aFonts.begin();
++second_font;
@@ -630,7 +630,7 @@ void PrintFontManager::countFontconfigFonts( std::unordered_map<OString, int, OS
pUpdate->m_eItalic = convertSlant(slant);
if( eStyleRes == FcResultMatch )
{
- pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 );
+ pUpdate->m_aStyleName = OStringToOUString( OString( reinterpret_cast<char*>(style) ), RTL_TEXTENCODING_UTF8 );
}
// update font cache
@@ -677,7 +677,7 @@ bool PrintFontManager::addFontconfigDir( const OString& rDirName )
if( nVersion <= 20400 )
return false;
const char* pDirName = (const char*)rDirName.getStr();
- bool bDirOk = (FcConfigAppFontAddDir(FcConfigGetCurrent(), (FcChar8*)pDirName ) == FcTrue);
+ bool bDirOk = (FcConfigAppFontAddDir(FcConfigGetCurrent(), reinterpret_cast<FcChar8 const *>(pDirName) ) == FcTrue);
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "FcConfigAppFontAddDir( \"%s\") => %d\n", pDirName, bDirOk );
@@ -693,7 +693,7 @@ bool PrintFontManager::addFontconfigDir( const OString& rDirName )
{
fclose( pCfgFile);
bool bCfgOk = FcConfigParseAndLoad(FcConfigGetCurrent(),
- (FcChar8*)aConfFileName.getStr(), FcTrue);
+ reinterpret_cast<FcChar8 const *>(aConfFileName.getStr()), FcTrue);
if( !bCfgOk )
fprintf( stderr, "FcConfigParseAndLoad( \"%s\") => %d\n", aConfFileName.getStr(), bCfgOk );
}
@@ -771,7 +771,7 @@ static void addtopattern(FcPattern *pPattern,
}
FcPatternAddInteger(pPattern, FC_SPACING, nSpacing);
if (nSpacing == FC_MONO)
- FcPatternAddString(pPattern, FC_FAMILY, (FcChar8*)"monospace");
+ FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast<FcChar8 const *>("monospace"));
}
}
@@ -786,13 +786,13 @@ namespace
OString sLangAttrib;
sLangAttrib = OUStringToOString(rLangTag.getBcp47(), RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
- if (FcStrSetMember(xLangSet.get(), (const FcChar8*)sLangAttrib.getStr()))
+ if (FcStrSetMember(xLangSet.get(), reinterpret_cast<const FcChar8*>(sLangAttrib.getStr())))
{
return sLangAttrib;
}
sLangAttrib = OUStringToOString(rLangTag.getLanguageAndScript(), RTL_TEXTENCODING_UTF8).toAsciiLowerCase();
- if (FcStrSetMember(xLangSet.get(), (const FcChar8*)sLangAttrib.getStr()))
+ if (FcStrSetMember(xLangSet.get(), reinterpret_cast<const FcChar8*>(sLangAttrib.getStr())))
{
return sLangAttrib;
}
@@ -803,13 +803,13 @@ namespace
if (!sRegion.isEmpty())
{
sLangAttrib = sLang + OString('-') + sRegion;
- if (FcStrSetMember(xLangSet.get(), (const FcChar8*)sLangAttrib.getStr()))
+ if (FcStrSetMember(xLangSet.get(), reinterpret_cast<const FcChar8*>(sLangAttrib.getStr())))
{
return sLangAttrib;
}
}
- if (FcStrSetMember(xLangSet.get(), (const FcChar8*)sLang.getStr()))
+ if (FcStrSetMember(xLangSet.get(), reinterpret_cast<const FcChar8*>(sLang.getStr())))
{
return sLang;
}
@@ -961,7 +961,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
FcPatternAddBool(pPattern, FC_SCALABLE, FcTrue);
const OString aTargetName = OUStringToOString( rPattern.maTargetName, RTL_TEXTENCODING_UTF8 );
- const FcChar8* pTargetNameUtf8 = (FcChar8*)aTargetName.getStr();
+ const FcChar8* pTargetNameUtf8 = reinterpret_cast<FcChar8 const *>(aTargetName.getStr());
FcPatternAddString(pPattern, FC_FAMILY, pTargetNameUtf8);
LanguageTag aLangTag(rPattern.meLanguage);
@@ -992,7 +992,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
}
if (!aLangAttrib.isEmpty())
- FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr());
+ FcPatternAddString(pPattern, FC_LANG, reinterpret_cast<FcChar8 const *>(aLangAttrib.getStr()));
addtopattern(pPattern, rPattern.GetSlant(), rPattern.GetWeight(),
rPattern.GetWidthType(), rPattern.GetPitch());
@@ -1029,7 +1029,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
nCollectionEntry = 0;
if( eFileRes == FcResultMatch )
{
- OString aDir, aBase, aOrgPath( (sal_Char*)file );
+ OString aDir, aBase, aOrgPath( reinterpret_cast<char*>(file) );
splitPath( aOrgPath, aDir, aBase );
int nDirID = getDirectoryAtom( aDir, true );
fontID aFont = findFontFileID( nDirID, aBase, nCollectionEntry );
@@ -1051,7 +1051,7 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
// get the family name
if( eFamilyRes == FcResultMatch )
{
- OString sFamily((sal_Char*)family);
+ OString sFamily(reinterpret_cast<char*>(family));
std::unordered_map< OString, OString, OStringHash >::const_iterator aI =
rWrapper.m_aFontNameToLocalized.find(sFamily);
if (aI != rWrapper.m_aFontNameToLocalized.end())
@@ -1185,7 +1185,7 @@ ImplFontOptions* PrintFontManager::getFontOptions(
if (aI != rWrapper.m_aLocalizedToCanonical.end())
sFamily = aI->second;
if( !sFamily.isEmpty() )
- FcPatternAddString(pPattern, FC_FAMILY, (FcChar8*)sFamily.getStr());
+ FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast<FcChar8 const *>(sFamily.getStr()));
addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
FcPatternAddDouble(pPattern, FC_PIXEL_SIZE, nSize);
@@ -1253,11 +1253,11 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star
const LanguageTag aLangTag(rLocale);
const OString aLangAttrib = mapToFontConfigLangTag(aLangTag);
if (!aLangAttrib.isEmpty())
- FcPatternAddString(pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr());
+ FcPatternAddString(pPattern, FC_LANG, reinterpret_cast<FcChar8 const *>(aLangAttrib.getStr()));
OString aFamily = OUStringToOString( rInfo.m_aFamilyName, RTL_TEXTENCODING_UTF8 );
if( !aFamily.isEmpty() )
- FcPatternAddString(pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr());
+ FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast<FcChar8 const *>(aFamily.getStr()));
addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch);
@@ -1282,7 +1282,7 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star
nCollectionEntry = 0;
if( eFileRes == FcResultMatch )
{
- OString aDir, aBase, aOrgPath( (sal_Char*)file );
+ OString aDir, aBase, aOrgPath( reinterpret_cast<char*>(file) );
splitPath( aOrgPath, aDir, aBase );
int nDirID = getDirectoryAtom( aDir, true );
fontID aFont = findFontFileID( nDirID, aBase, nCollectionEntry );
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 142179f..736513a 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1019,7 +1019,7 @@ OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const
}
else if( pNameRecord->platformID == 1 )
{
- OString aName((const sal_Char*)(pNameRecord->sptr), pNameRecord->slen);
+ OString aName(reinterpret_cast<char*>(pNameRecord->sptr), pNameRecord->slen);
rtl_TextEncoding eEncoding = RTL_TEXTENCODING_DONTKNOW;
switch (pNameRecord->encodingID)
{
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx
index aadfa0f..ecd4cca 100644
--- a/vcl/generic/fontmanager/helper.cxx
+++ b/vcl/generic/fontmanager/helper.cxx
@@ -264,8 +264,8 @@ bool psp::convertPfbToPfa( ::osl::File& rInFile, ::osl::File& rOutFile )
{
// this might be a pfa font already
if( ! rInFile.read( buffer+6, 9, nRead ) && nRead == 9 &&
- ( ! std::strncmp( (char*)buffer, "%!FontType1-", 12 ) ||
- ! std::strncmp( (char*)buffer, "%!PS-AdobeFont-", 15 ) ) )
+ ( ! std::strncmp( reinterpret_cast<char*>(buffer), "%!FontType1-", 12 ) ||
+ ! std::strncmp( reinterpret_cast<char*>(buffer), "%!PS-AdobeFont-", 15 ) ) )
{
sal_uInt64 nWrite = 0;
if( rOutFile.write( buffer, 15, nWrite ) || nWrite != 15 )
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index bdbc0b6..635abb3 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -169,7 +169,7 @@ bool FtFontFile::Map()
return false;
}
mnFileSize = aStat.st_size;
- mpFileMap = (const unsigned char*)
+ mpFileMap = (unsigned char*)
mmap( NULL, mnFileSize, PROT_READ, MAP_SHARED, nFile, 0 );
if( mpFileMap == MAP_FAILED )
mpFileMap = NULL;
@@ -184,7 +184,7 @@ void FtFontFile::Unmap()
if( (--mnRefCount > 0) || (mpFileMap == NULL) )
return;
- munmap( (char*)mpFileMap, mnFileSize );
+ munmap( mpFileMap, mnFileSize );
mpFileMap = NULL;
}
@@ -1058,7 +1058,7 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
if( pGlyphFT->format != FT_GLYPH_FORMAT_BITMAP )
{
if( pGlyphFT->format == FT_GLYPH_FORMAT_OUTLINE )
- ((FT_OutlineGlyphRec*)pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
+ reinterpret_cast<FT_OutlineGlyphRec*>(pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
FT_Render_Mode nRenderMode = FT_RENDER_MODE_MONO;
rc = FT_Glyph_To_Bitmap( &pGlyphFT, nRenderMode, NULL, true );
@@ -1176,7 +1176,7 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
}
if( pGlyphFT->format == FT_GLYPH_FORMAT_OUTLINE )
- ((FT_OutlineGlyph)pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
+ reinterpret_cast<FT_OutlineGlyph>(pGlyphFT)->outline.flags |= FT_OUTLINE_HIGH_PRECISION;
bool bEmbedded = (pGlyphFT->format == FT_GLYPH_FORMAT_BITMAP);
if( !bEmbedded )
diff --git a/vcl/generic/glyphs/gcach_ftyp.hxx b/vcl/generic/glyphs/gcach_ftyp.hxx
index beee332..590fb90 100644
--- a/vcl/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/generic/glyphs/gcach_ftyp.hxx
@@ -48,7 +48,7 @@ private:
FtFontFile( const OString& rNativeFileName );
const OString maNativeFileName;
- const unsigned char* mpFileMap;
+ unsigned char* mpFileMap;
int mnFileSize;
int mnRefCount;
int mnLangBoost;
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 8719844..ae4a2f7 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -137,7 +137,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((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, (void*) pBuffer, NULL);
return pBlob;
}
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 1e63ab0..f9a6e3a 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -424,20 +424,20 @@ void GenPspGraphics::drawRect( long nX, long nY, long nDX, long nDY )
void GenPspGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint *pPtAry )
{
- m_pPrinterGfx->DrawPolyLine (nPoints, (Point*)pPtAry);
+ m_pPrinterGfx->DrawPolyLine (nPoints, reinterpret_cast<Point const *>(pPtAry));
}
void GenPspGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
// Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
- m_pPrinterGfx->DrawPolygon (nPoints, (Point*)pPtAry);
+ m_pPrinterGfx->DrawPolygon (nPoints, reinterpret_cast<Point const *>(pPtAry));
}
void GenPspGraphics::drawPolyPolygon( sal_uInt32 nPoly,
const sal_uInt32 *pPoints,
PCONSTSALPOINT *pPtAry )
{
- m_pPrinterGfx->DrawPolyPolygon (nPoly, pPoints, (const Point**)pPtAry);
+ m_pPrinterGfx->DrawPolyPolygon (nPoly, pPoints, reinterpret_cast<const Point**>(pPtAry));
}
bool GenPspGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double /*fTransparency*/ )
@@ -459,13 +459,13 @@ bool GenPspGraphics::drawPolyLine(
bool GenPspGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
- m_pPrinterGfx->DrawPolyLineBezier (nPoints, (Point*)pPtAry, pFlgAry);
+ m_pPrinterGfx->DrawPolyLineBezier (nPoints, reinterpret_cast<Point const *>(pPtAry), pFlgAry);
return true;
}
bool GenPspGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
{
- m_pPrinterGfx->DrawPolygonBezier (nPoints, (Point*)pPtAry, pFlgAry);
+ m_pPrinterGfx->DrawPolygonBezier (nPoints, reinterpret_cast<Point const *>(pPtAry), pFlgAry);
return true;
}
@@ -475,7 +475,7 @@ bool GenPspGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly,
const sal_uInt8* const* pFlgAry )
{
// Point must be equal to SalPoint! see vcl/inc/salgtype.hxx
- m_pPrinterGfx->DrawPolyPolygonBezier (nPoly, pPoints, (Point**)pPtAry, (sal_uInt8**)pFlgAry);
+ m_pPrinterGfx->DrawPolyPolygonBezier (nPoly, pPoints, reinterpret_cast<Point const * const *>(pPtAry), (sal_uInt8**)pFlgAry);
return true;
}
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/generic/print/glyphset.cxx
index 30946a3..b3314ab 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/generic/print/glyphset.cxx
@@ -540,7 +540,7 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
OString aPSName( OUStringToOString( rGfx.GetFontMgr().getPSName( mnFontID ), RTL_TEXTENCODING_ISO_8859_1 ) );
OString aBytes( OUStringToOString( OUString( pStr, nLen ), mnBaseEncoding ) );
rGfx.PSSetFont( aPSName, mnBaseEncoding );
- rGfx.PSShowText( (const unsigned char*)aBytes.getStr(), nLen, aBytes.getLength() );
+ rGfx.PSShowText( reinterpret_cast<const unsigned char*>(aBytes.getStr()), nLen, aBytes.getLength() );
return;
}
@@ -585,7 +585,7 @@ GlyphSet::ImplDrawText (PrinterGfx &rGfx, const Point& rPoint,
OString aBytes( OUStringToOString( OUString( pStr, nLen ), mnBaseEncoding ) );
rGfx.PSMoveTo( rPoint );
rGfx.PSSetFont( aPSName, mnBaseEncoding );
- rGfx.PSShowText( (const unsigned char*)aBytes.getStr(), nLen, aBytes.getLength(), pDeltaArray );
+ rGfx.PSShowText( reinterpret_cast<const unsigned char*>(aBytes.getStr()), nLen, aBytes.getLength(), pDeltaArray );
return;
}
diff --git a/vcl/generic/print/psputil.cxx b/vcl/generic/print/psputil.cxx
index 9d47556..ecea28f 100644
--- a/vcl/generic/print/psputil.cxx
+++ b/vcl/generic/print/psputil.cxx
@@ -223,7 +223,7 @@ ConverterFactory::Convert (const sal_Unicode *pText, int nTextLen,
rtl_UnicodeToTextContext aContext = rtl_createUnicodeToTextContext (aConverter);
sal_Size nSize = rtl_convertUnicodeToText (aConverter, aContext,
- pText, nTextLen, (sal_Char*)pBuffer, nBufferSize,
+ pText, nTextLen, reinterpret_cast<char*>(pBuffer), nBufferSize,
nCvtFlags, &nCvtInfo, &nCvtChars);
rtl_destroyUnicodeToTextContext (aConverter, aContext);
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 235c599..e890580 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -119,10 +119,7 @@ public:
virtual void ErrorTrapPush() SAL_OVERRIDE;
virtual bool ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE;
- inline GtkSalDisplay *GetGtkDisplay() const
- {
- return (GtkSalDisplay *)GetDisplay();
- }
+ inline GtkSalDisplay *GetGtkDisplay() const;
};
class GtkSalFrame;
@@ -193,6 +190,11 @@ inline GdkDisplay *GtkData::GetGdkDisplay()
return GetGtkDisplay()->GetGdkDisplay();
}
+GtkSalDisplay *GtkData::GetGtkDisplay() const
+{
+ return static_cast<GtkSalDisplay *>(GetDisplay());
+}
+
#endif // INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 10f0a40..a6330e4 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -40,7 +40,7 @@ void VclComplexTextTest::testArabic()
0x86, 0x20, 0xd8, 0xab, 0xd9, 0x84, 0xd8, 0xa7,
0xd8, 0xab, 0xd8, 0xa9, 0xd9, 0x8c, 0x00
};
- OUString aOneTwoThree( (sal_Char *)pOneTwoThreeUTF8,
+ OUString aOneTwoThree( reinterpret_cast<char const *>(pOneTwoThreeUTF8),
SAL_N_ELEMENTS( pOneTwoThreeUTF8 ) - 1,
RTL_TEXTENCODING_UTF8 );
vcl::Window* pWin = new WorkWindow( (vcl::Window *)NULL );
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index a07b720..523b2f7 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -460,7 +460,7 @@ void DbgDialogTest( vcl::Window* pWindow )
if ( !pGetChild )
return;
- boost::scoped_array<Rectangle> pRectAry((Rectangle*)new long[(sizeof(Rectangle)*nChildCount)/sizeof(long)]);
+ boost::scoped_array<Rectangle> pRectAry(reinterpret_cast<Rectangle*>(new long[(sizeof(Rectangle)*nChildCount)/sizeof(long)]));
memset( pRectAry.get(), 0, sizeof(Rectangle)*nChildCount );
if ( pWindow->IsDialog() )
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index c02f0a9..19890e7 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1384,7 +1384,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist )
aTkLib.loadRelative(&thisModule, aLibName, SAL_LOADMODULE_DEFAULT);
if (aTkLib.is())
{
- FN_TkCreateUnoWrapper fnCreateWrapper = (FN_TkCreateUnoWrapper)aTkLib.getFunctionSymbol("CreateUnoWrapper");
+ FN_TkCreateUnoWrapper fnCreateWrapper = reinterpret_cast<FN_TkCreateUnoWrapper>(aTkLib.getFunctionSymbol("CreateUnoWrapper"));
if ( fnCreateWrapper )
{
pSVData->mpUnoWrapper = fnCreateWrapper();
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 0a3c6be..0ca4698 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -164,7 +164,7 @@ static void KillDirEntry( const OUString& rMainUrl )
// Helper functions
-sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nComp, sal_uLong nSize )
+sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDest, sal_uLong nComp, sal_uLong nSize )
{
while ( nComp-- >= nSize )
{
@@ -506,8 +506,8 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
if( !bTest || rFormatExtension.startsWith( "EPS" ) )
{
bSomethingTested = true;
- if ( ( nFirstLong == 0xC5D0D3C6 ) || ( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"%!PS-Adobe", 10, 10 ) &&
- ImplSearchEntry( &sFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) )
+ if ( ( nFirstLong == 0xC5D0D3C6 ) || ( ImplSearchEntry( sFirstBytes, reinterpret_cast<sal_uInt8 const *>("%!PS-Adobe"), 10, 10 ) &&
+ ImplSearchEntry( &sFirstBytes[15], reinterpret_cast<sal_uInt8 const *>("EPS"), 3, 3 ) ) )
{
rFormatExtension = "EPS";
return true;
@@ -518,7 +518,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
if( !bTest || rFormatExtension.startsWith( "DXF" ) )
{
// Binary DXF File Format
- if( strncmp( (const char*) sFirstBytes, "AutoCAD Binary DXF", 18 ) == 0 )
+ if( strncmp( reinterpret_cast<char*>(sFirstBytes), "AutoCAD Binary DXF", 18 ) == 0 )
{
rFormatExtension = "DXF";
return true;
@@ -540,7 +540,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
while( i<256 && sFirstBytes[i]<=32 )
++i;
- if (i+7<256 && (strncmp((const char*)(sFirstBytes+i),"SECTION",7)==0))
+ if (i+7<256 && (strncmp(reinterpret_cast<char*>(sFirstBytes+i),"SECTION",7)==0))
{
rFormatExtension = "DXF";
return true;
@@ -604,7 +604,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
if( !bTest )
{
bSomethingTested = true;
- if( ImplSearchEntry( sFirstBytes, (sal_uInt8*)"/* XPM */", 256, 9 ) )
+ if( ImplSearchEntry( sFirstBytes, reinterpret_cast<sal_uInt8 const *>("/* XPM */"), 256, 9 ) )
{
rFormatExtension = "XPM";
return true;
@@ -624,11 +624,11 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
rStream.Seek( nStreamPos );
rStream.Read( pBuf.get(), nSize );
- sal_uInt8* pPtr = ImplSearchEntry( pBuf.get(), (sal_uInt8*)"#define", nSize, 7 );
+ sal_uInt8* pPtr = ImplSearchEntry( pBuf.get(), reinterpret_cast<sal_uInt8 const *>("#define"), nSize, 7 );
if( pPtr )
{
- if( ImplSearchEntry( pPtr, (sal_uInt8*)"_width", pBuf.get() + nSize - pPtr, 6 ) )
+ if( ImplSearchEntry( pPtr, reinterpret_cast<sal_uInt8 const *>("_width"), pBuf.get() + nSize - pPtr, 6 ) )
{
rFormatExtension = "XBM";
return true;
@@ -670,20 +670,20 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
// check for Xml
// #119176# SVG files which have no xml header at all have shown up this is optional
- if( ImplSearchEntry(pCheckArray, (sal_uInt8*)"<?xml", nCheckSize, 5 ) // is it xml
- && ImplSearchEntry(pCheckArray, (sal_uInt8*)"version", nCheckSize, 7 )) // does it have a version (required for xml)
+ if( ImplSearchEntry(pCheckArray, reinterpret_cast<sal_uInt8 const *>("<?xml"), nCheckSize, 5 ) // is it xml
+ && ImplSearchEntry(pCheckArray, reinterpret_cast<sal_uInt8 const *>("version"), nCheckSize, 7 )) // does it have a version (required for xml)
{
// check for DOCTYPE svg combination
- if( ImplSearchEntry(pCheckArray, (sal_uInt8*)"DOCTYPE", nCheckSize, 7 ) // 'DOCTYPE' is there
- && ImplSearchEntry(pCheckArray, (sal_uInt8*)"svg", nCheckSize, 3 )) // 'svg' is there
+ if( ImplSearchEntry(pCheckArray, reinterpret_cast<sal_uInt8 const *>("DOCTYPE"), nCheckSize, 7 ) // 'DOCTYPE' is there
+ && ImplSearchEntry(pCheckArray, reinterpret_cast<sal_uInt8 const *>("svg"), nCheckSize, 3 )) // 'svg' is there
{
bIsSvg = true;
}
}
// check for svg element in 1st 256 bytes
- if(!bIsSvg && ImplSearchEntry(pCheckArray, (sal_uInt8*)"<svg", nCheckSize, 4 )) // '<svg'
+ if(!bIsSvg && ImplSearchEntry(pCheckArray, reinterpret_cast<sal_uInt8 const *>("<svg"), nCheckSize, 4 )) // '<svg'
{
bIsSvg = true;
}
@@ -709,7 +709,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
nCheckSize = rStream.Read(sExtendedOrDecompressedFirstBytes, nCheckSize);
}
- if(ImplSearchEntry(pCheckArray, (sal_uInt8*)"<svg", nCheckSize, 4)) // '<svg'
+ if(ImplSearchEntry(pCheckArray, reinterpret_cast<sal_uInt8 const *>("<svg"), nCheckSize, 4)) // '<svg'
{
bIsSvg = true;
}
@@ -984,7 +984,7 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
if( !mpfnImport )
{
#ifndef DISABLE_DYNLOADING
- mpfnImport = (PFilterCall) maLibrary.getFunctionSymbol(OUString(IMPORT_FUNCTION_NAME));
+ mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol(OUString(IMPORT_FUNCTION_NAME)));
#else
if( maFiltername.equalsAscii( "icd" ) )
mpfnImport = icdGraphicImport;
@@ -2114,7 +2114,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString
OUString aPhysicalName( ImpCreateFullFilterPath( aFilterPath.getToken(i, ';'), aFilterName ) );
osl::Module aLibrary( aPhysicalName );
- PFilterCall pFunc = (PFilterCall) aLibrary.getFunctionSymbol(OUString(EXPORT_FUNCTION_NAME));
+ PFilterCall pFunc = reinterpret_cast<PFilterCall>(aLibrary.getFunctionSymbol(OUString(EXPORT_FUNCTION_NAME)));
// Execute dialog in DLL
#else
PFilterCall pFunc = NULL;
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index 4d8e5c3..7f35629 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -915,8 +915,8 @@ bool GraphicDescriptor::ImpDetectEPS( SvStream& rStm, bool )
rStm.Read( &nFirstBytes, 20 );
if ( ( nFirstLong == 0xC5D0D3C6 ) || aPathExt.startsWith( "eps" ) ||
- ( ImplSearchEntry( nFirstBytes, (sal_uInt8*)"%!PS-Adobe", 10, 10 )
- && ImplSearchEntry( &nFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) )
+ ( ImplSearchEntry( nFirstBytes, reinterpret_cast<sal_uInt8 const *>("%!PS-Adobe"), 10, 10 )
+ && ImplSearchEntry( &nFirstBytes[15], reinterpret_cast<sal_uInt8 const *>("EPS"), 3, 3 ) ) )
{
nFormat = GFF_EPS;
bRet = true;
diff --git a/vcl/source/filter/graphicfilter_internal.hxx b/vcl/source/filter/graphicfilter_internal.hxx
index 3e27c30..8f3931e 100644
--- a/vcl/source/filter/graphicfilter_internal.hxx
+++ b/vcl/source/filter/graphicfilter_internal.hxx
@@ -22,7 +22,7 @@
#include "tools/solar.h"
-sal_uInt8* ImplSearchEntry( sal_uInt8* , sal_uInt8* , sal_uLong , sal_uLong );
+sal_uInt8* ImplSearchEntry( sal_uInt8*, sal_uInt8 const *, sal_uLong, sal_uLong );
extern bool isPCT(SvStream& rStream, sal_uLong nStreamPos, sal_uLong nStreamLen);
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 7b87230..0b14c77 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -362,7 +362,7 @@ bool GIFReader::ReadLocalHeader()
SvMemoryStream aMemStm;
BitmapPalette* pPal;
- aMemStm.SetBuffer( (char*) pBuf, 9, false, 9 );
+ aMemStm.SetBuffer( pBuf, 9, false, 9 );
aMemStm.ReadUInt16( nImagePosX );
aMemStm.ReadUInt16( nImagePosY );
aMemStm.ReadUInt16( nImageWidth );
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index 81c13f2..06e1d97 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -346,7 +346,7 @@ bool XPMReader::ImplGetColSub( sal_uInt8* pDest )
if ( std::strlen(pRGBTable[i].name) > mnParaSize &&
pRGBTable[ i ].name[ mnParaSize ] == 0 )
{
- if ( ImplCompare ( (unsigned char*)pRGBTable[ i ].name,
+ if ( ImplCompare ( reinterpret_cast<unsigned char const *>(pRGBTable[ i ].name),
mpPara, mnParaSize, XPMCASENONSENSITIVE ) )
{
bColStatus = true;
@@ -456,7 +456,7 @@ sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara )
else return 0;
}
-bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSize, sal_uLong nMode )
+bool XPMReader::ImplCompare( sal_uInt8 const * pSource, sal_uInt8 const * pDest, sal_uLong nSize, sal_uLong nMode )
{
bool bRet = true;
diff --git a/vcl/source/filter/ixpm/xpmread.hxx b/vcl/source/filter/ixpm/xpmread.hxx
index ad9911a..c8f7636 100644
--- a/vcl/source/filter/ixpm/xpmread.hxx
+++ b/vcl/source/filter/ixpm/xpmread.hxx
@@ -91,7 +91,7 @@ private:
bool ImplGetColKey( sal_uInt8 );
void ImplGetRGBHex( sal_uInt8*, sal_uLong );
bool ImplGetPara( sal_uLong numb );
- bool ImplCompare( sal_uInt8*, sal_uInt8*, sal_uLong, sal_uLong nmode = XPMCASENONSENSITIVE );
+ bool ImplCompare( sal_uInt8 const *, sal_uInt8 const *, sal_uLong, sal_uLong nmode = XPMCASENONSENSITIVE );
sal_uLong ImplGetULONG( sal_uLong nPara );
public:
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index a39c2db..fc59664 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -156,7 +156,7 @@ bool Exif::processIFD(sal_uInt8* pExifData, sal_uInt16 aLength, sal_uInt16 aOffs
while (aOffset <= aLength - 12 && aNumberOfTags > 0)
{
- ifd = (ExifIFD*) &pExifData[aOffset];
+ ifd = reinterpret_cast<ExifIFD*>(&pExifData[aOffset]);
sal_uInt16 tag = ifd->tag;
if (bSwap)
{
@@ -216,7 +216,7 @@ bool Exif::processExif(SvStream& rStream, sal_uInt16 aSectionLength, bool bSetVa
// Exif detected
mbExifPresent = true;
- TiffHeader* aTiffHeader = (TiffHeader*) &aExifData[0];
+ TiffHeader* aTiffHeader = reinterpret_cast<TiffHeader*>(&aExifData[0]);
bool bIntel = aTiffHeader->byteOrder == 0x4949; //big-endian
bool bMotorola = aTiffHeader->byteOrder == 0x4D4D; //little-endian
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index 1d400a5..78c2ae8 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -56,7 +56,7 @@ struct SourceManagerStruct {
*/
extern "C" void init_source (j_decompress_ptr cinfo)
{
- SourceManagerStruct * source = (SourceManagerStruct *) cinfo->src;
+ SourceManagerStruct * source = reinterpret_cast<SourceManagerStruct *>(cinfo->src);
/* We reset the empty-input-file flag for each image,
* but we don't clear the input buffer.
@@ -90,7 +90,7 @@ long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize )
extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo)
{
- SourceManagerStruct * source = (SourceManagerStruct *) cinfo->src;
+ SourceManagerStruct * source = reinterpret_cast<SourceManagerStruct *>(cinfo->src);
size_t nbytes;
nbytes = StreamRead(source->stream, source->buffer, BUFFER_SIZE);
@@ -117,7 +117,7 @@ extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo)
extern "C" void skip_input_data (j_decompress_ptr cinfo, long numberOfBytes)
{
- SourceManagerStruct * source = (SourceManagerStruct *) cinfo->src;
+ SourceManagerStruct * source = reinterpret_cast<SourceManagerStruct *>(cinfo->src);
/* Just a dumb implementation for now. Could use fseek() except
* it doesn't work on pipes. Not clear that being smart is worth
@@ -160,13 +160,13 @@ void jpeg_svstream_src (j_decompress_ptr cinfo, void* input)
if (cinfo->src == NULL)
{ /* first time for this JPEG object? */
cinfo->src = (jpeg_source_mgr *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(SourceManagerStruct));
- source = (SourceManagerStruct *) cinfo->src;
+ (*cinfo->mem->alloc_small) (reinterpret_cast<j_common_ptr>(cinfo), JPOOL_PERMANENT, sizeof(SourceManagerStruct));
+ source = reinterpret_cast<SourceManagerStruct *>(cinfo->src);
source->buffer = (JOCTET *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, BUFFER_SIZE * sizeof(JOCTET));
+ (*cinfo->mem->alloc_small) (reinterpret_cast<j_common_ptr>(cinfo), JPOOL_PERMANENT, BUFFER_SIZE * sizeof(JOCTET));
}
- source = (SourceManagerStruct *) cinfo->src;
+ source = reinterpret_cast<SourceManagerStruct *>(cinfo->src);
source->pub.init_source = init_source;
source->pub.fill_input_buffer = fill_input_buffer;
source->pub.skip_input_data = skip_input_data;
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 09a5250..16e6ccf 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -40,11 +40,11 @@ struct DestinationManagerStruct
extern "C" void init_destination (j_compress_ptr cinfo)
{
- DestinationManagerStruct * destination = (DestinationManagerStruct *) cinfo->dest;
+ DestinationManagerStruct * destination = reinterpret_cast<DestinationManagerStruct *>(cinfo->dest);
/* Allocate the output buffer -- it will be released when done with image */
destination->buffer = (JOCTET *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, BUFFER_SIZE * sizeof(JOCTET));
+ (*cinfo->mem->alloc_small) (reinterpret_cast<j_common_ptr>(cinfo), JPOOL_IMAGE, BUFFER_SIZE * sizeof(JOCTET));
destination->pub.next_output_byte = destination->buffer;
destination->pub.free_in_buffer = BUFFER_SIZE;
@@ -52,7 +52,7 @@ extern "C" void init_destination (j_compress_ptr cinfo)
extern "C" boolean empty_output_buffer (j_compress_ptr cinfo)
{
- DestinationManagerStruct * destination = (DestinationManagerStruct *) cinfo->dest;
+ DestinationManagerStruct * destination = reinterpret_cast<DestinationManagerStruct *>(cinfo->dest);
if (destination->stream->Write(destination->buffer, BUFFER_SIZE) != (size_t) BUFFER_SIZE)
{
@@ -67,7 +67,7 @@ extern "C" boolean empty_output_buffer (j_compress_ptr cinfo)
extern "C" void term_destination (j_compress_ptr cinfo)
{
- DestinationManagerStruct * destination = (DestinationManagerStruct *) cinfo->dest;
+ DestinationManagerStruct * destination = reinterpret_cast<DestinationManagerStruct *>(cinfo->dest);
size_t datacount = BUFFER_SIZE - destination->pub.free_in_buffer;
/* Write any data remaining in the buffer */
@@ -94,10 +94,10 @@ void jpeg_svstream_dest (j_compress_ptr cinfo, void* output)
if (cinfo->dest == NULL)
{ /* first time for this JPEG object? */
cinfo->dest = (jpeg_destination_mgr*)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof(DestinationManagerStruct));
+ (*cinfo->mem->alloc_small) (reinterpret_cast<j_common_ptr>(cinfo), JPOOL_PERMANENT, sizeof(DestinationManagerStruct));
}
- destination = (DestinationManagerStruct *) cinfo->dest;
+ destination = reinterpret_cast<DestinationManagerStruct *>(cinfo->dest);
destination->pub.init_destination = init_destination;
destination->pub.empty_output_buffer = empty_output_buffer;
destination->pub.term_destination = term_destination;
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 411b17b..2c9908b 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -45,7 +45,7 @@ struct ErrorManagerStruct
extern "C" void errorExit (j_common_ptr cinfo)
{
- ErrorManagerStruct * error = (ErrorManagerStruct *) cinfo->err;
+ ErrorManagerStruct * error = reinterpret_cast<ErrorManagerStruct *>(cinfo->err);
(*cinfo->err->output_message) (cinfo);
longjmp(error->setjmp_buffer, 1);
}
diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx
index 0d10492..57faee3 100644
--- a/vcl/source/filter/sgfbram.cxx
+++ b/vcl/source/filter/sgfbram.cxx
@@ -35,7 +35,7 @@ SgfHeader::SgfHeader()
SvStream& ReadSgfHeader(SvStream& rIStream, SgfHeader& rHead)
{
- rIStream.Read((char*)&rHead.Magic,SgfHeaderSize);
+ rIStream.Read(&rHead.Magic, SgfHeaderSize);
#if defined OSL_BIGENDIAN
rHead.Magic =OSL_SWAPWORD(rHead.Magic );
rHead.Version=OSL_SWAPWORD(rHead.Version);
@@ -65,7 +65,7 @@ SgfEntry::SgfEntry()
SvStream& ReadSgfEntry(SvStream& rIStream, SgfEntry& rEntr)
{
- rIStream.Read((char*)&rEntr.Typ,SgfEntrySize);
+ rIStream.Read(&rEntr.Typ, SgfEntrySize);
#if defined OSL_BIGENDIAN
rEntr.Typ =OSL_SWAPWORD(rEntr.Typ );
rEntr.iFrei=OSL_SWAPWORD(rEntr.iFrei);
@@ -82,7 +82,7 @@ sal_uInt32 SgfEntry::GetOffset()
SvStream& ReadSgfVector(SvStream& rIStream, SgfVector& rVect)
{
- rIStream.Read((char*)&rVect,sizeof(rVect));
+ rIStream.Read(&rVect, sizeof(rVect));
#if defined OSL_BIGENDIAN
rVect.Flag =OSL_SWAPWORD(rVect.Flag );
rVect.x =OSL_SWAPWORD(rVect.x );
@@ -104,7 +104,7 @@ SvStream& WriteBmpFileHeader(SvStream& rOStream, BmpFileHeader& rHead)
rHead.OfsLo =OSL_SWAPWORD(rHead.OfsLo );
rHead.OfsHi =OSL_SWAPWORD(rHead.OfsHi );
#endif
- rOStream.Write((char*)&rHead,sizeof(rHead));
+ rOStream.Write(&rHead, sizeof(rHead));
#if defined OSL_BIGENDIAN
rHead.Typ =OSL_SWAPWORD(rHead.Typ );
rHead.SizeLo =OSL_SWAPWORD(rHead.SizeLo );
@@ -149,7 +149,7 @@ SvStream& WriteBmpInfoHeader(SvStream& rOStream, BmpInfoHeader& rInfo)
rInfo.ColUsed =OSL_SWAPDWORD (rInfo.ColUsed );
rInfo.ColMust =OSL_SWAPDWORD (rInfo.ColMust );
#endif
- rOStream.Write((char*)&rInfo,sizeof(rInfo));
+ rOStream.Write(&rInfo, sizeof(rInfo));
#if defined OSL_BIGENDIAN
rInfo.Size =OSL_SWAPDWORD (rInfo.Size );
rInfo.Width =OSL_SWAPDWORD (rInfo.Width );
@@ -168,7 +168,7 @@ SvStream& WriteBmpInfoHeader(SvStream& rOStream, BmpInfoHeader& rInfo)
SvStream& WriteRGBQuad(SvStream& rOStream, const RGBQuad& rQuad)
{
- rOStream.Write((char*)&rQuad,sizeof(rQuad));
+ rOStream.Write(&rQuad, sizeof(rQuad));
return rOStream;
}
@@ -190,10 +190,10 @@ sal_uInt8 PcxExpand::GetByte(SvStream& rInp)
if (Count>0) {
Count--;
} else {
- rInp.Read((char*)&Data,1);
+ rInp.Read(&Data, 1);
if ((Data & 0xC0) == 0xC0) {
Count=(Data & 0x3F) -1;
- rInp.Read((char*)&Data,1);
+ rInp.Read(&Data, 1);
}
}
return Data;
@@ -247,14 +247,14 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
WriteRGBQuad( rOut, RGBQuad(0xFF,0xFF,0xFF) ); // white
nOfs=rOut.Tell();
for (j=0;j<rHead.Ysize;j++)
- rOut.Write((char*)pBuf.get(),nWdtOut); // fill file with zeroes
+ rOut.Write(pBuf.get(), nWdtOut); // fill file with zeroes
for (j=0;j<rHead.Ysize;j++) {
for(i=0;i<nWdtInp;i++) {
pBuf[i]=aPcx.GetByte(rInp);
}
for(i=nWdtInp;i<nWdtOut;i++) pBuf[i]=0; // up to 3 bytes
rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards
- rOut.Write((char*)pBuf.get(),nWdtOut);
+ rOut.Write(pBuf.get(), nWdtOut);
}
} else if (nColors==16) {
sal_uInt8 pl2= 0; // planes' masks
@@ -278,7 +278,7 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
nOfs=rOut.Tell();
for (j=0;j<rHead.Ysize;j++)
- rOut.Write((char*)pBuf.get(),nWdtOut); // fill file with zeroes
+ rOut.Write(pBuf.get(), nWdtOut); // fill file with zeroes
for (j=0;j<rHead.Ysize;j++) {
memset(pBuf.get(),0,nWdtOut);
for(k=0;k<4;k++) {
@@ -302,27 +302,27 @@ bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntry&)
}
for(i=nWdtInp*4;i<nWdtOut;i++) pBuf[i]=0; // up to 3 bytes
rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards
- rOut.Write((char*)pBuf.get(),nWdtOut);
+ rOut.Write(pBuf.get(), nWdtOut);
}
} else if (nColors==256) {
cRGB[3]=0; // fourth palette entry for BMP
for (i=0;i<256;i++) { // copy palette
- rInp.Read((char*)cRGB,3);
+ rInp.Read(cRGB, 3);
pl1=cRGB[0]; // switch red and blue
cRGB[0]=cRGB[2];
cRGB[2]=pl1;
- rOut.Write((char*)cRGB,4);
+ rOut.Write(cRGB, 4);
}
nOfs=rOut.Tell();
for (j=0;j<rHead.Ysize;j++)
- rOut.Write((char*)pBuf.get(),nWdtOut); // fill file with zeroes
+ rOut.Write(pBuf.get(), nWdtOut); // fill file with zeroes
for (j=0;j<rHead.Ysize;j++) {
for(i=0;i<rHead.Xsize;i++)
pBuf[i]=aPcx.GetByte(rInp);
for(i=rHead.Xsize;i<nWdtOut;i++) pBuf[i]=0; // up to 3 bytes
rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // write backwards
- rOut.Write((char*)pBuf.get(),nWdtOut);
+ rOut.Write(pBuf.get(), nWdtOut);
}
}
return true;
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 956b8c0..4e130e5 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -136,7 +136,7 @@ sal_uInt16 MulDiv(sal_uInt16 a, sal_uInt16 Mul, sal_uInt16 Div)
SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd)
{
- rIStream.Read((char*)&rDtHd.Reserved[0],DtHdSize);
+ rIStream.Read(&rDtHd.Reserved[0], DtHdSize);
return rIStream;
}
@@ -154,7 +154,7 @@ PageType::PageType()
SvStream& ReadPageType(SvStream& rIStream, PageType& rPage)
{
- rIStream.Read((char*)&rPage.Next,PageSize);
+ rIStream.Read(&rPage.Next, PageSize);
#if defined OSL_BIGENDIAN
SWAPPAGE(rPage);
#endif
@@ -173,7 +173,7 @@ SvStream& ReadObjkType(SvStream& rInp, ObjkType& rObjk)
// fileposition in stream is not changed!
sal_uLong nPos;
nPos=rInp.Tell();
- rInp.Read((char*)&rObjk.Last,ObjkSize);
+ rInp.Read(&rObjk.Last, ObjkSize);
#if defined OSL_BIGENDIAN
SWAPOBJK(rObjk);
#endif
@@ -182,7 +182,7 @@ SvStream& ReadObjkType(SvStream& rInp, ObjkType& rObjk)
}
SvStream& ReadStrkType(SvStream& rInp, StrkType& rStrk)
{
- rInp.Read((char*)&rStrk.Last,StrkSize);
+ rInp.Read(&rStrk.Last, StrkSize);
#if defined OSL_BIGENDIAN
SWAPOBJK (rStrk);
SWAPLINE (rStrk.L);
@@ -193,7 +193,7 @@ SvStream& ReadStrkType(SvStream& rInp, StrkType& rStrk)
}
SvStream& ReadRectType(SvStream& rInp, RectType& rRect)
{
- rInp.Read((char*)&rRect.Last,RectSize);
+ rInp.Read(&rRect.Last, RectSize);
#if defined OSL_BIGENDIAN
SWAPOBJK (rRect);
SWAPLINE (rRect.L);
@@ -208,7 +208,7 @@ SvStream& ReadRectType(SvStream& rInp, RectType& rRect)
}
SvStream& ReadPolyType(SvStream& rInp, PolyType& rPoly)
{
- rInp.Read((char*)&rPoly.Last,PolySize);
+ rInp.Read(&rPoly.Last, PolySize);
#if defined OSL_BIGENDIAN
SWAPOBJK (rPoly);
SWAPLINE (rPoly.L);
@@ -218,7 +218,7 @@ SvStream& ReadPolyType(SvStream& rInp, PolyType& rPoly)
}
SvStream& ReadSplnType(SvStream& rInp, SplnType& rSpln)
{
- rInp.Read((char*)&rSpln.Last,SplnSize);
+ rInp.Read(&rSpln.Last, SplnSize);
#if defined OSL_BIGENDIAN
SWAPOBJK (rSpln);
SWAPLINE (rSpln.L);
@@ -228,7 +228,7 @@ SvStream& ReadSplnType(SvStream& rInp, SplnType& rSpln)
}
SvStream& ReadCircType(SvStream& rInp, CircType& rCirc)
{
- rInp.Read((char*)&rCirc.Last,CircSize);
+ rInp.Read(&rCirc.Last, CircSize);
#if defined OSL_BIGENDIAN
SWAPOBJK (rCirc);
SWAPLINE (rCirc.L);
@@ -243,7 +243,7 @@ SvStream& ReadCircType(SvStream& rInp, CircType& rCirc)
}
SvStream& ReadTextType(SvStream& rInp, TextType& rText)
{
- rInp.Read((char*)&rText.Last,TextSize);
+ rInp.Read(&rText.Last, TextSize);
#if defined OSL_BIGENDIAN
SWAPOBJK (rText);
SWAPTEXT (rText.T);
@@ -261,7 +261,7 @@ SvStream& ReadTextType(SvStream& rInp, TextType& rText)
}
SvStream& ReadBmapType(SvStream& rInp, BmapType& rBmap)
{
- rInp.Read((char*)&rBmap.Last,BmapSize);
+ rInp.Read(&rBmap.Last, BmapSize);
#if defined OSL_BIGENDIAN
SWAPOBJK (rBmap);
SWAPAREA (rBmap.F);
@@ -275,7 +275,7 @@ SvStream& ReadBmapType(SvStream& rInp, BmapType& rBmap)
}
SvStream& ReadGrupType(SvStream& rInp, GrupType& rGrup)
{
- rInp.Read((char*)&rGrup.Last,GrupSize);
+ rInp.Read(&rGrup.Last, GrupSize);
#if defined OSL_BIGENDIAN
SWAPOBJK (rGrup);
rGrup.SbLo =OSL_SWAPWORD(rGrup.SbLo );
@@ -710,7 +710,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
ReadTextType( rInp, aText );
if (!rInp.GetError()) {
aText.Buffer=new UCHAR[aText.BufSize+1]; // add one for LookAhead at CK-separation
- rInp.Read((char* )aText.Buffer,aText.BufSize);
+ rInp.Read(aText.Buffer, aText.BufSize);
if (!rInp.GetError()) aText.Draw(rOut);
delete[] aText.Buffer;
}
@@ -727,7 +727,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
ReadPolyType( rInp, aPoly );
if (!rInp.GetError()) {
aPoly.EckP=new PointType[aPoly.nPoints];
- rInp.Read((char*)aPoly.EckP,4*aPoly.nPoints);
+ rInp.Read(aPoly.EckP, 4*aPoly.nPoints);
#if defined OSL_BIGENDIAN
for(short i=0;i<aPoly.nPoints;i++) SWAPPOINT(aPoly.EckP[i]);
#endif
@@ -740,7 +740,7 @@ void DrawObjkList( SvStream& rInp, OutputDevice& rOut )
ReadSplnType( rInp, aSpln );
if (!rInp.GetError()) {
aSpln.EckP=new PointType[aSpln.nPoints];
- rInp.Read((char*)aSpln.EckP,4*aSpln.nPoints);
+ rInp.Read(aSpln.EckP, 4*aSpln.nPoints);
#if defined OSL_BIGENDIAN
for(short i=0;i<aSpln.nPoints;i++) SWAPPOINT(aSpln.EckP[i]);
#endif
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 1d22d09..0d8fb69 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1834,7 +1834,7 @@ void Type1Emitter::emitAllCrypted( void)
// apply t1crypt
for( char* p = maBuffer; p < mpPtr; ++p) {
*p ^= (mnEECryptR >> 8);
- mnEECryptR = (*(U8*)p + mnEECryptR) * 52845 + 22719;
+ mnEECryptR = (*reinterpret_cast<U8*>(p) + mnEECryptR) * 52845 + 22719;
}
// emit the t1crypt result
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 737a7a7..921aa09 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1096,12 +1096,12 @@ typedef struct _subHeader2 {
} subHeader2;
static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, const sal_uInt32 nMaxCmapSize, sal_uInt32 c) {
- sal_uInt16 *CMAP2 = (sal_uInt16 *) cmap;
+ sal_uInt16 const *CMAP2 = reinterpret_cast<sal_uInt16 const *>(cmap);
sal_uInt8 theHighByte;
sal_uInt8 theLowByte;
- subHeader2* subHeader2s;
- sal_uInt16* subHeader2Keys;
+ subHeader2 const * subHeader2s;
+ sal_uInt16 const * subHeader2Keys;
sal_uInt16 firstCode;
int k = -1;
sal_uInt32 ToReturn;
@@ -1109,24 +1109,24 @@ static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, const sal_uInt32 nMaxCmapSize
theHighByte = (sal_uInt8)((c >> 8) & 0x00ff);
theLowByte = (sal_uInt8)(c & 0x00ff);
subHeader2Keys = CMAP2 + 3;
- subHeader2s = (subHeader2 *)(subHeader2Keys + 256);
- if(reinterpret_cast<sal_uInt8*>(&subHeader2Keys[theHighByte]) - cmap < int(nMaxCmapSize - 2))
+ subHeader2s = reinterpret_cast<subHeader2 const *>(subHeader2Keys + 256);
+ if(reinterpret_cast<sal_uInt8 const *>(&subHeader2Keys[theHighByte]) - cmap < int(nMaxCmapSize - 2))
{
k = Int16FromMOTA(subHeader2Keys[theHighByte]) / 8;
// check if the subheader record fits into available space
- if((k >= 0) && (reinterpret_cast<sal_uInt8*>(&subHeader2s[k]) - cmap >= int(nMaxCmapSize - sizeof(subHeader2))))
+ if((k >= 0) && (reinterpret_cast<sal_uInt8 const *>(&subHeader2s[k]) - cmap >= int(nMaxCmapSize - sizeof(subHeader2))))
k = -1;
}
if(k == 0) {
firstCode = Int16FromMOTA(subHeader2s[0].firstCode);
if(theLowByte >= firstCode && theLowByte < (firstCode + Int16FromMOTA(subHeader2s[k].entryCount))) {
- sal_uInt16* const pGlyph = (&(subHeader2s[0].idRangeOffset))
+ sal_uInt16 const * pGlyph = (&(subHeader2s[0].idRangeOffset))
+ (Int16FromMOTA(subHeader2s[0].idRangeOffset)/2) /* + offset */
+ theLowByte /* + to_look */
- firstCode
;
- if (reinterpret_cast<sal_uInt8*>(pGlyph) - cmap < int(nMaxCmapSize) - 4)
+ if (reinterpret_cast<sal_uInt8 const *>(pGlyph) - cmap < int(nMaxCmapSize) - 4)
return *pGlyph;
else
return MISSING_GLYPH_INDEX;
@@ -1155,7 +1155,7 @@ static sal_uInt32 getGlyph2(const sal_uInt8 *cmap, const sal_uInt32 nMaxCmapSize
static sal_uInt32 getGlyph6(const sal_uInt8 *cmap, sal_uInt32, sal_uInt32 c) {
sal_uInt16 firstCode, lastCode, count;
- sal_uInt16 *CMAP6 = (sal_uInt16 *) cmap;
+ sal_uInt16 const *CMAP6 = reinterpret_cast<sal_uInt16 const *>(cmap);
firstCode = Int16FromMOTA(*(CMAP6 + 3));
count = Int16FromMOTA(*(CMAP6 + 4));
@@ -1167,7 +1167,7 @@ static sal_uInt32 getGlyph6(const sal_uInt8 *cmap, sal_uInt32, sal_uInt32 c) {
}
}
-static sal_uInt16 GEbinsearch(sal_uInt16 *ar, sal_uInt16 length, sal_uInt16 toSearch) {
+static sal_uInt16 GEbinsearch(sal_uInt16 const *ar, sal_uInt16 length, sal_uInt16 toSearch) {
signed int low, high, lastfound = 0xffff;
sal_uInt16 res;
if(length == (sal_uInt16)0 || length == (sal_uInt16)0xFFFF) {
@@ -1192,13 +1192,13 @@ static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, const sal_uInt32 nMaxCmapSize
sal_uInt16 i;
int ToReturn;
sal_uInt16 segCount;
- sal_uInt16 * startCode;
- sal_uInt16 * endCode;
- sal_uInt16 * idDelta;
+ sal_uInt16 const * startCode;
+ sal_uInt16 const * endCode;
+ sal_uInt16 const * idDelta;
/* sal_uInt16 * glyphIdArray; */
- sal_uInt16 * idRangeOffset;
+ sal_uInt16 const * idRangeOffset;
/*sal_uInt16 * glyphIndexArray;*/
- sal_uInt16 *CMAP4 = (sal_uInt16 *) cmap;
+ sal_uInt16 const *CMAP4 = reinterpret_cast<sal_uInt16 const *>(cmap);
/* sal_uInt16 GEbinsearch(sal_uInt16 *ar, sal_uInt16 length, sal_uInt16 toSearch); */
segCount = Int16FromMOTA(*(CMAP4 + 3))/2;
@@ -1210,16 +1210,16 @@ static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, const sal_uInt32 nMaxCmapSize
}
startCode = endCode + segCount + 1;
- if((reinterpret_cast<sal_uInt8*>(&startCode[i]) - cmap >= int(nMaxCmapSize - 2)) || Int16FromMOTA(startCode[i]) > c) {
+ if((reinterpret_cast<sal_uInt8 const *>(&startCode[i]) - cmap >= int(nMaxCmapSize - 2)) || Int16FromMOTA(startCode[i]) > c) {
return MISSING_GLYPH_INDEX;
}
idDelta = startCode + segCount;
idRangeOffset = idDelta + segCount;
/*glyphIndexArray = idRangeOffset + segCount;*/
- if((reinterpret_cast<sal_uInt8*>(&idRangeOffset[i]) - cmap < int(nMaxCmapSize - 2)) && Int16FromMOTA(idRangeOffset[i]) != 0) {
- sal_uInt16 * pGlyphOffset = &(idRangeOffset[i]) + (Int16FromMOTA(idRangeOffset[i])/2 + (c - Int16FromMOTA(startCode[i])));
- if(reinterpret_cast<sal_uInt8*>(pGlyphOffset) - cmap >= int(nMaxCmapSize - 2))
+ if((reinterpret_cast<sal_uInt8 const *>(&idRangeOffset[i]) - cmap < int(nMaxCmapSize - 2)) && Int16FromMOTA(idRangeOffset[i]) != 0) {
+ sal_uInt16 const * pGlyphOffset = &(idRangeOffset[i]) + (Int16FromMOTA(idRangeOffset[i])/2 + (c - Int16FromMOTA(startCode[i])));
+ if(reinterpret_cast<sal_uInt8 const *>(pGlyphOffset) - cmap >= int(nMaxCmapSize - 2))
return MISSING_GLYPH_INDEX;
c = Int16FromMOTA(*pGlyphOffset);
}
@@ -1229,7 +1229,7 @@ static sal_uInt32 getGlyph4(const sal_uInt8 *cmap, const sal_uInt32 nMaxCmapSize
}
static sal_uInt32 getGlyph12(const sal_uInt8 *pCmap, sal_uInt32, sal_uInt32 cChar) {
- const sal_uInt32* pCMAP12 = (const sal_uInt32*)pCmap;
+ const sal_uInt32* pCMAP12 = reinterpret_cast<const sal_uInt32*>(pCmap);
int nLength = Int32FromMOTA( pCMAP12[1] );
int nGroups = Int32FromMOTA( pCMAP12[3] );
int nLower = 0;
@@ -1647,7 +1647,7 @@ static int doOpenTTFont( sal_uInt32 facenum, TrueTypeFont* t )
if( nDelta )
for( int j = 0; j < NUM_TAGS; ++j )
if( t->tables[j] )
- *(char**)&t->tables[j] -= nDelta;
+ *reinterpret_cast<char const **>(&t->tables[j]) -= nDelta;
break;
}
}
@@ -1747,7 +1747,7 @@ void CloseTTFont(TrueTypeFont *ttf)
{
#if !defined(WIN32)
if( ttf->fname )
- munmap((char *) ttf->ptr, ttf->fsize);
+ munmap(ttf->ptr, ttf->fsize);
#endif
free(ttf->fname);
free(ttf->goffsets);
@@ -2008,7 +2008,7 @@ int CreateTTFromTTGlyphs(TrueTypeFont *ttf,
newname.slen = name[i].slen + strlen(suffix);
*/
const sal_uInt8 ptr[] = {0,'T',0,'r',0,'u',0,'e',0,'T',0,'y',0,'p',0,'e',0,'S',0,'u',0,'b',0,'s',0,'e',0,'t'};
- NameRecord n1 = {1, 0, 0, 6, 14, (sal_uInt8*)"TrueTypeSubset"};
+ NameRecord n1 = {1, 0, 0, 6, 14, const_cast<sal_uInt8 *>(reinterpret_cast<sal_uInt8 const *>("TrueTypeSubset"))};
NameRecord n2 = {3, 1, 1033, 6, 28, 0};
n2.sptr = (sal_uInt8 *) ptr;
name = TrueTypeTableNew_name(0, 0);
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index e65c7cc..25c66d1 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.cxx
@@ -201,7 +201,7 @@ void TrueTypeCreatorNewEmpty(sal_uInt32 tag, TrueTypeCreator **_this)
TrueTypeCreator* ptr = (TrueTypeCreator*)smalloc(sizeof(TrueTypeCreator));
ptr->tables = listNewEmpty();
- listSetElementDtor(ptr->tables, (list_destructor)TrueTypeTableDispose);
+ listSetElementDtor(ptr->tables, reinterpret_cast<list_destructor>(TrueTypeTableDispose));
ptr->tag = tag;
@@ -294,7 +294,7 @@ int StreamToMemory(TrueTypeCreator *_this, sal_uInt8 **ptr, sal_uInt32 *length)
/* Table Directory */
for (int i = 0; i < numTables; ++i) {
PutUInt32(te[i].tag, ttf + 12, 16 * i, 1);
- PutUInt32(CheckSum((sal_uInt32 *) te[i].data, te[i].length), ttf + 12, 16 * i + 4, 1);
+ PutUInt32(CheckSum(reinterpret_cast<sal_uInt32 *>(te[i].data), te[i].length), ttf + 12, 16 * i + 4, 1);
PutUInt32(offset, ttf + 12, 16 * i + 8, 1);
PutUInt32(te[i].length, ttf + 12, 16 * i + 12, 1);
@@ -309,7 +309,7 @@ int StreamToMemory(TrueTypeCreator *_this, sal_uInt8 **ptr, sal_uInt32 *length)
free(te);
- p = (sal_uInt32 *) ttf;
+ p = reinterpret_cast<sal_uInt32 *>(ttf);
for (int i = 0; i < (int)s / 4; ++i) checkSumAdjustment += p[i];
PutUInt32(0xB1B0AFBA - checkSumAdjustment, head, 8, 1);
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 050eaa5..5a8bad6 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -1701,7 +1701,7 @@ bool Bitmap::Replace( const Color* pSearchColors, const Color* pReplaceColors,
memset( pTols, 0, nColorCount * sizeof( long ) );
}
else
- pTols = (long*) _pTols;
+ pTols = reinterpret_cast<long*>(_pTols);
for( i = 0UL; i < nColorCount; i++ )
{
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 2115160..83ce47f 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -2247,7 +2247,7 @@ bool Bitmap::ImplReduceMedian( sal_uInt16 nColCount )
const long nHeight = pWAcc->Height();
long nIndex = 0L;
- memset( (HPBYTE) pColBuf, 0, nSize );
+ memset( pColBuf, 0, nSize );
// create Buffer
if( pRAcc->HasPalette() )
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 32ca3cc..a18b9c2 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -127,9 +127,9 @@ bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
const long nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
long* pColm = new long[ nWidth2 ];
long* pRows = new long[ nHeight2 ];
- BitmapColor* pColRow1 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
- BitmapColor* pColRow2 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
- BitmapColor* pColRow3 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
+ BitmapColor* pColRow1 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
+ BitmapColor* pColRow2 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
+ BitmapColor* pColRow3 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
BitmapColor* pRowTmp1 = pColRow1;
BitmapColor* pRowTmp2 = pColRow2;
BitmapColor* pRowTmp3 = pColRow3;
@@ -228,9 +228,9 @@ bool Bitmap::ImplConvolute3( const long* pMatrix, long nDivisor,
}
delete[] pKoeff;
- delete[] (sal_uInt8*) pColRow1;
- delete[] (sal_uInt8*) pColRow2;
- delete[] (sal_uInt8*) pColRow3;
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow1);
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow2);
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow3);
delete[] pColm;
delete[] pRows;
@@ -272,9 +272,9 @@ bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
const long nHeight = pWriteAcc->Height(), nHeight2 = nHeight + 2;
long* pColm = new long[ nWidth2 ];
long* pRows = new long[ nHeight2 ];
- BitmapColor* pColRow1 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
- BitmapColor* pColRow2 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
- BitmapColor* pColRow3 = (BitmapColor*) new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ];
+ BitmapColor* pColRow1 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
+ BitmapColor* pColRow2 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
+ BitmapColor* pColRow3 = reinterpret_cast<BitmapColor*>(new sal_uInt8[ sizeof( BitmapColor ) * nWidth2 ]);
BitmapColor* pRowTmp1 = pColRow1;
BitmapColor* pRowTmp2 = pColRow2;
BitmapColor* pRowTmp3 = pColRow3;
@@ -357,9 +357,9 @@ bool Bitmap::ImplMedianFilter( const BmpFilterParam* /*pFilterParam*/, const Lin
}
}
- delete[] (sal_uInt8*) pColRow1;
- delete[] (sal_uInt8*) pColRow2;
- delete[] (sal_uInt8*) pColRow3;
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow1);
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow2);
+ delete[] reinterpret_cast<sal_uInt8*>(pColRow3);
delete[] pColm;
delete[] pRows;
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 9e4994c..7ad7387 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -299,7 +299,7 @@ void BitmapReadAccess::ImplZeroInitUnusedBits()
nMask = OSL_SWAPDWORD( nMask );
#endif
for( sal_uInt32 i = 0; i < nHeight; i++, pLast4Bytes += nScanSize )
- ( *(sal_uInt32*) pLast4Bytes ) &= nMask;
+ *reinterpret_cast<sal_uInt32*>(pLast4Bytes) &= nMask;
}
}
}
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index cf290bb..9cc2543 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -457,7 +457,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
sal_Int16 nVersion;
// read header
- rIStm.Read( (char*) &aCode, sizeof( aCode ) ); // Identifier
+ rIStm.Read( aCode, sizeof( aCode ) ); // Identifier
rIStm.ReadInt16( nSize ); // Size
rIStm.ReadInt16( nVersion ); // Version
sal_Int32 nTmp32(0);
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index 2e37798..1a9eb33 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -611,7 +611,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( ; nCount--; nY += nI )
{
- if (rIStm.Read( (char*)( pTmp16 = (sal_uInt16*) pBuf.get() ), nAlignedWidth )
+ if (rIStm.Read( ( pTmp16 = reinterpret_cast<sal_uInt16*>(pBuf.get()) ), nAlignedWidth )
!= nAlignedWidth)
{
return false;
@@ -619,7 +619,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( long nX = 0L; nX < nWidth; nX++ )
{
- aMask.GetColorFor16BitLSB( aColor, (sal_uInt8*) pTmp16++ );
+ aMask.GetColorFor16BitLSB( aColor, reinterpret_cast<sal_uInt8*>(pTmp16++) );
rAcc.SetPixel( nY, nX, aColor );
}
}
@@ -662,7 +662,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( ; nCount--; nY += nI )
{
- if (rIStm.Read( (char*)( pTmp32 = (sal_uInt32*) pBuf.get() ), nAlignedWidth )
+ if (rIStm.Read( ( pTmp32 = reinterpret_cast<sal_uInt32*>(pBuf.get()) ), nAlignedWidth )
!= nAlignedWidth)
{
return false;
@@ -670,7 +670,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( long nX = 0L; nX < nWidth; nX++ )
{
- aMask.GetColorAndAlphaFor32Bit( aColor, aAlpha, (sal_uInt8*) pTmp32++ );
+ aMask.GetColorAndAlphaFor32Bit( aColor, aAlpha, reinterpret_cast<sal_uInt8*>(pTmp32++) );
rAcc.SetPixel( nY, nX, aColor );
pAccAlpha->SetPixelIndex(nY, nX, sal_uInt8(0xff) - aAlpha);
rAlphaUsed |= bool(0xff != aAlpha);
@@ -681,7 +681,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
{
for( ; nCount--; nY += nI )
{
- if (rIStm.Read( (char*)( pTmp32 = (sal_uInt32*) pBuf.get() ), nAlignedWidth )
+ if (rIStm.Read( ( pTmp32 = reinterpret_cast<sal_uInt32*>(pBuf.get()) ), nAlignedWidth )
!= nAlignedWidth)
{
return false;
@@ -689,7 +689,7 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header& rHeader, BitmapWriteAccess& r
for( long nX = 0L; nX < nWidth; nX++ )
{
- aMask.GetColorFor32Bit( aColor, (sal_uInt8*) pTmp32++ );
+ aMask.GetColorFor32Bit( aColor, reinterpret_cast<sal_uInt8*>(pTmp32++) );
rAcc.SetPixel( nY, nX, aColor );
}
}
@@ -793,7 +793,7 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, Bitmap* pBmpAlpha, sal_uLon
// set decoded bytes to memory stream,
// from which we will read the bitmap data
pIStm = pMemStm = new SvMemoryStream;
- pMemStm->SetBuffer( (char*) pData, nUncodedSize, false, nUncodedSize );
+ pMemStm->SetBuffer( pData, nUncodedSize, false, nUncodedSize );
nOffset = 0;
}
else
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx
index 5706022..43485d7 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -114,7 +114,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference< io::XInputStream > st
unsigned char *nakedPointerToUncompressedFont = NULL;
libeot::EOTMetadata eotMetadata;
libeot::EOTError uncompressError =
- libeot::EOT2ttf_buffer( (const unsigned char *)&fontData[0], fontData.size(), &eotMetadata, &nakedPointerToUncompressedFont, &uncompressedFontSize );
+ libeot::EOT2ttf_buffer( reinterpret_cast<unsigned char *>(&fontData[0]), fontData.size(), &eotMetadata, &nakedPointerToUncompressedFont, &uncompressedFontSize );
boost::shared_ptr<unsigned char> uncompressedFont( nakedPointerToUncompressedFont, libeot::EOTfreeBuffer );
if( uncompressError != libeot::EOT_SUCCESS )
{
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 8cf4747..65b3537 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -507,7 +507,7 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct,
// delay intialization of XGraphic, to only expose
// XGraphic-generating services to arbitrary binary data
uno::Sequence< sal_Int8 > aSeq(
- (sal_Int8*)pData, pEndData-pData );
+ reinterpret_cast<sal_Int8 const *>(pData), pEndData-pData );
uno::Sequence<uno::Any> aGraphicsArgs(1);
aGraphicsArgs[0] = makeAny(aSeq);
xInit->initialize(aGraphicsArgs);
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 1c825bf..c352b81 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -174,7 +174,7 @@ bool GfxLink::LoadNative( Graphic& rGraphic )
SvMemoryStream aMemStm;
sal_uLong nCvtType;
- aMemStm.SetBuffer( (char*) pData, mnBufSize, false, mnBufSize );
+ aMemStm.SetBuffer( const_cast<sal_uInt8*>(pData), mnBufSize, false, mnBufSize );
switch( meType )
{
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 32727c4..b547380 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -157,7 +157,7 @@ void ImplPointArray::ImplSetSize( sal_uLong nSize )
rtl_freeMemory( mpArray );
mpArray = (Point*) rtl_allocateMemory( nTotal );
- memset( (HPBYTE) mpArray, 0, nTotal );
+ memset( mpArray, 0, nTotal );
}
inline Point& ImplPointArray::operator[]( sal_uLong nPos )
@@ -646,7 +646,7 @@ bool ImplVectorizer::ImplVectorize( const Bitmap& rColorBmp, GDIMetaFile& rMtf,
const long nHeight = pRAcc->Height();
const sal_uInt16 nColorCount = pRAcc->GetPaletteEntryCount();
sal_uInt16 n;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list