[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 89 commits - basegfx/source basic/source chart2/source cli_ure/qa codemaker/source comphelper/source compilerplugins/clang configure.ac connectivity/source cppcanvas/source cui/source dbaccess/source desktop/source download.lst drawinglayer/source dtrans/source editeng/source extensions/source external/cairo external/fontconfig filter/source forms/source framework/source hwpfilter/source i18npool/source include/basegfx include/codemaker include/comphelper include/dbaccess include/oox include/sot include/svtools include/svx include/tools include/vbahelper include/vcl include/xmloff include/xmlscript l10ntools/source libreofficekit/qa lotuswordpro/source o3tl/qa odk/examples offapi/com officecfg/README oox/source package/source registry/source reportdesign/source salhelper/source sal/osl sal/qa sal/rtl sccomp/source sc/inc sc/Library_sc.mk scripting/source sc/source sdext/source sd/source sfx2/source shell/source slideshow/source so lenv/bin solenv/gdb sot/source starmath/source stoc/source stoc/test svl/source svtools/qa svtools/source svx/source sw/qa sw/source tools/source unotools/source vbahelper/source vcl/headless vcl/inc vcl/opengl vcl/osx vcl/qa vcl/quartz vcl/source vcl/unx vcl/win vcl/workben winaccessibility/source writerperfect/source xmloff/source
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Tue Dec 5 15:11:29 UTC 2017
basegfx/source/curve/b2dcubicbezier.cxx | 2
basegfx/source/polygon/b2dpolypolygon.cxx | 16
basegfx/source/polygon/b3dpolypolygon.cxx | 16
basic/source/runtime/methods.cxx | 2
basic/source/runtime/props.cxx | 2
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 2
chart2/source/controller/main/SelectionHelper.cxx | 4
chart2/source/controller/main/UndoGuard.hxx | 2
chart2/source/view/charttypes/GL3DBarChart.cxx | 1
cli_ure/qa/climaker/ClimakerTestCase.java | 2
codemaker/source/codemaker/exceptiontree.cxx | 9
codemaker/source/cppumaker/cpputype.cxx | 8
codemaker/source/javamaker/javatype.cxx | 4
comphelper/source/eventattachermgr/eventattachermgr.cxx | 2
compilerplugins/clang/store/cascadingassignop.cxx | 2
compilerplugins/clang/store/cascadingcondop.cxx | 2
compilerplugins/clang/unusedfields.cxx | 13
compilerplugins/clang/useuniqueptr.cxx | 182 ++
configure.ac | 2
connectivity/source/drivers/firebird/ResultSet.cxx | 2
connectivity/source/drivers/hsqldb/HView.cxx | 4
cppcanvas/source/mtfrenderer/emfplus.cxx | 7
cui/source/dialogs/cuigrfflt.cxx | 24
cui/source/dialogs/hltpbase.cxx | 5
cui/source/options/optchart.cxx | 2
cui/source/options/optcolor.cxx | 2
cui/source/tabpages/macroass.cxx | 12
cui/source/tabpages/paragrph.cxx | 2
dbaccess/source/core/api/CacheSet.hxx | 46
dbaccess/source/core/api/FilteredContainer.cxx | 2
dbaccess/source/core/api/KeySet.hxx | 4
dbaccess/source/core/api/RowSet.hxx | 5
dbaccess/source/core/api/RowSetBase.hxx | 2
dbaccess/source/core/dataaccess/ModelImpl.hxx | 1
dbaccess/source/core/dataaccess/connection.hxx | 1
dbaccess/source/core/dataaccess/databasecontext.hxx | 2
dbaccess/source/core/dataaccess/databasedocument.cxx | 1
dbaccess/source/core/dataaccess/databasedocument.hxx | 3
dbaccess/source/core/dataaccess/datasource.hxx | 4
dbaccess/source/core/dataaccess/documentdefinition.hxx | 1
dbaccess/source/core/dataaccess/intercept.hxx | 1
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 2
dbaccess/source/core/inc/TableDeco.hxx | 1
dbaccess/source/core/inc/table.hxx | 2
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 2
dbaccess/source/filter/xml/xmlExport.cxx | 4
dbaccess/source/filter/xml/xmlExport.hxx | 2
dbaccess/source/filter/xml/xmlfilter.hxx | 3
dbaccess/source/inc/apitools.hxx | 7
dbaccess/source/ui/app/AppController.hxx | 2
dbaccess/source/ui/inc/RelationController.hxx | 2
dbaccess/source/ui/inc/TableController.hxx | 4
dbaccess/source/ui/inc/exsrcbrw.hxx | 2
dbaccess/source/ui/inc/formadapter.hxx | 1
dbaccess/source/ui/inc/querycontroller.hxx | 2
dbaccess/source/ui/inc/sbagrid.hxx | 2
dbaccess/source/ui/inc/unodatbr.hxx | 2
dbaccess/source/ui/inc/unosqlmessage.hxx | 2
dbaccess/source/ui/querydesign/limitboxcontroller.hxx | 8
dbaccess/source/ui/querydesign/querycontroller.cxx | 2
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 2
dbaccess/source/ui/uno/ColumnControl.hxx | 8
dbaccess/source/ui/uno/ColumnModel.hxx | 8
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 2
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 2
dbaccess/source/ui/uno/TableFilterDlg.hxx | 2
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 2
dbaccess/source/ui/uno/admindlg.hxx | 2
dbaccess/source/ui/uno/composerdialogs.hxx | 16
dbaccess/source/ui/uno/copytablewizard.cxx | 2
dbaccess/source/ui/uno/dbinteraction.hxx | 16
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 8
dbaccess/source/ui/uno/unoDirectSql.hxx | 8
desktop/source/app/app.cxx | 5
desktop/source/migration/migration.cxx | 2
download.lst | 3
drawinglayer/source/primitive2d/animatedprimitive2d.cxx | 4
drawinglayer/source/primitive2d/graphicprimitive2d.cxx | 2
drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx | 6
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 4
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 6
drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx | 14
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 62 -
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx | 2
drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx | 2
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 1
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 2
drawinglayer/source/processor2d/vclprocessor2d.cxx | 2
drawinglayer/source/processor3d/defaultprocessor3d.cxx | 6
drawinglayer/source/texture/texture3d.cxx | 4
dtrans/source/win32/dnd/globals.hxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/impedit2.cxx | 3
editeng/source/outliner/outlvw.cxx | 5
extensions/source/scanner/grid.cxx | 2
external/cairo/pixman/pixman-0.24.4.patch | 72 +
external/fontconfig/UnpackedTarball_fontconfig.mk | 4
external/fontconfig/fontconfig-2.12.1.patch.1 | 135 ++
external/fontconfig/fontconfig-2.8.0.patch | 64 -
filter/source/graphicfilter/egif/egif.cxx | 12
filter/source/graphicfilter/eps/eps.cxx | 16
filter/source/graphicfilter/ipcd/ipcd.cxx | 2
filter/source/msfilter/msdffimp.cxx | 6
filter/source/msfilter/svdfppt.cxx | 8
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 10
forms/source/component/imgprod.cxx | 10
framework/source/layoutmanager/layoutmanager.cxx | 1
framework/source/services/autorecovery.cxx | 1
framework/source/services/frame.cxx | 2
framework/source/services/sessionlistener.cxx | 2
framework/source/uielement/menubarmanager.cxx | 2
framework/source/uielement/toolbarmanager.cxx | 1
hwpfilter/source/hwpreader.cxx | 7
hwpfilter/source/hwpreader.hxx | 4
i18npool/source/localedata/LocaleNode.cxx | 17
include/basegfx/pixel/bpixel.hxx | 2
include/basegfx/polygon/b3dpolypolygontools.hxx | 8
include/basegfx/raster/bpixelraster.hxx | 5
include/basegfx/raster/bzpixelraster.hxx | 5
include/codemaker/exceptiontree.hxx | 3
include/comphelper/numberedcollection.hxx | 8
include/dbaccess/IController.hxx | 2
include/oox/helper/binaryinputstream.hxx | 2
include/oox/helper/containerhelper.hxx | 2
include/sot/filelist.hxx | 4
include/svtools/grfmgr.hxx | 28
include/svtools/parhtml.hxx | 6
include/svx/contdlg.hxx | 2
include/svx/galmisc.hxx | 4
include/svx/svdmark.hxx | 2
include/tools/color.hxx | 2
include/tools/colordata.hxx | 2
include/tools/stream.hxx | 14
include/vbahelper/vbadialogbase.hxx | 1
include/vbahelper/vbadialogsbase.hxx | 1
include/vbahelper/vbadocumentbase.hxx | 1
include/vbahelper/vbadocumentsbase.hxx | 1
include/vbahelper/vbapagesetupbase.hxx | 1
include/vbahelper/vbatextframe.hxx | 1
include/vcl/alpha.hxx | 4
include/vcl/animate.hxx | 2
include/vcl/bitmap.hxx | 91 -
include/vcl/bitmapaccess.hxx | 429 ++----
include/vcl/builder.hxx | 2
include/vcl/button.hxx | 74 -
include/vcl/commandevent.hxx | 4
include/vcl/dockwin.hxx | 8
include/vcl/field.hxx | 94 -
include/vcl/gdimtf.hxx | 2
include/vcl/graph.hxx | 25
include/vcl/graphicfilter.hxx | 32
include/vcl/idle.hxx | 1
include/vcl/lazydelete.hxx | 2
include/vcl/lineinfo.hxx | 2
include/vcl/longcurr.hxx | 32
include/vcl/metaact.hxx | 7
include/vcl/metric.hxx | 2
include/vcl/msgbox.hxx | 7
include/vcl/oldprintadaptor.hxx | 2
include/vcl/pdfwriter.hxx | 1
include/vcl/print.hxx | 4
include/vcl/printerinfomanager.hxx | 3
include/vcl/salbtype.hxx | 293 +---
include/vcl/salctype.hxx | 1
include/vcl/scopedbitmapaccess.hxx | 40
include/vcl/spinfld.hxx | 70 -
include/vcl/syswin.hxx | 7
include/vcl/textdata.hxx | 3
include/vcl/timer.hxx | 2
include/vcl/txtattr.hxx | 4
include/xmloff/XMLCharContext.hxx | 2
include/xmloff/XMLEventsImportContext.hxx | 2
include/xmloff/XMLShapeStyleContext.hxx | 4
include/xmloff/controlpropertyhdl.hxx | 1
include/xmloff/formlayerexport.hxx | 1
include/xmloff/styleexp.hxx | 14
include/xmloff/txtparae.hxx | 5
include/xmloff/xmlexp.hxx | 4
include/xmlscript/xml_helper.hxx | 6
l10ntools/source/lngmerge.cxx | 7
l10ntools/source/propmerge.cxx | 6
libreofficekit/qa/tilebench/tilebench.cxx | 34
lotuswordpro/source/filter/lwpbasetype.cxx | 4
lotuswordpro/source/filter/lwpbreaksoverride.cxx | 7
lotuswordpro/source/filter/lwpbreaksoverride.hxx | 2
lotuswordpro/source/filter/lwpcelllayout.cxx | 4
lotuswordpro/source/filter/lwpcharacterstyle.cxx | 26
lotuswordpro/source/filter/lwpcontent.cxx | 2
lotuswordpro/source/filter/lwpdivinfo.cxx | 26
lotuswordpro/source/filter/lwpdivopts.cxx | 4
lotuswordpro/source/filter/lwpdlvlist.cxx | 6
lotuswordpro/source/filter/lwpdoc.cxx | 34
lotuswordpro/source/filter/lwpdocdata.cxx | 46
lotuswordpro/source/filter/lwpfootnote.cxx | 18
lotuswordpro/source/filter/lwpframelayout.cxx | 10
lotuswordpro/source/filter/lwpframelayout.hxx | 4
lotuswordpro/source/filter/lwpfrib.cxx | 3
lotuswordpro/source/filter/lwpfrib.hxx | 4
lotuswordpro/source/filter/lwpgrfobj.cxx | 5
lotuswordpro/source/filter/lwpholder.cxx | 8
lotuswordpro/source/filter/lwpidxmgr.cxx | 19
lotuswordpro/source/filter/lwplayout.cxx | 9
lotuswordpro/source/filter/lwplayout.hxx | 2
lotuswordpro/source/filter/lwplaypiece.cxx | 30
lotuswordpro/source/filter/lwpmarker.cxx | 24
lotuswordpro/source/filter/lwpnotes.cxx | 6
lotuswordpro/source/filter/lwpnumericfmt.hxx | 2
lotuswordpro/source/filter/lwpobj.cxx | 9
lotuswordpro/source/filter/lwpobj.hxx | 2
lotuswordpro/source/filter/lwpoleobject.cxx | 8
lotuswordpro/source/filter/lwppagehint.cxx | 12
lotuswordpro/source/filter/lwppagelayout.cxx | 4
lotuswordpro/source/filter/lwppara.cxx | 18
lotuswordpro/source/filter/lwpparaproperty.cxx | 1
lotuswordpro/source/filter/lwpparaproperty.hxx | 4
lotuswordpro/source/filter/lwpparastyle.cxx | 34
lotuswordpro/source/filter/lwppiece.hxx | 2
lotuswordpro/source/filter/lwpproplist.cxx | 4
lotuswordpro/source/filter/lwprowlayout.cxx | 4
lotuswordpro/source/filter/lwpsection.cxx | 18
lotuswordpro/source/filter/lwpsilverbullet.cxx | 5
lotuswordpro/source/filter/lwpsilverbullet.hxx | 2
lotuswordpro/source/filter/lwpstory.cxx | 5
lotuswordpro/source/filter/lwpstory.hxx | 4
lotuswordpro/source/filter/lwptable.cxx | 10
lotuswordpro/source/filter/lwptablelayout.cxx | 9
lotuswordpro/source/filter/lwptabrack.cxx | 4
lotuswordpro/source/filter/lwptblcell.cxx | 26
lotuswordpro/source/filter/lwptblformula.cxx | 6
lotuswordpro/source/filter/lwptoc.cxx | 16
lotuswordpro/source/filter/lwpverdocument.cxx | 4
lotuswordpro/source/filter/lwpvpointer.cxx | 2
lotuswordpro/source/filter/tocread.cxx | 10
lotuswordpro/source/filter/tocread.hxx | 5
lotuswordpro/source/filter/xfilter/xfcell.cxx | 5
lotuswordpro/source/filter/xfilter/xfcell.hxx | 5
lotuswordpro/source/filter/xfilter/xfcellstyle.cxx | 4
lotuswordpro/source/filter/xfilter/xfcellstyle.hxx | 4
lotuswordpro/source/filter/xfilter/xfsaxstream.cxx | 5
lotuswordpro/source/filter/xfilter/xfsaxstream.hxx | 3
lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx | 4
lotuswordpro/source/filter/xfilter/xfsectionstyle.hxx | 3
lotuswordpro/source/filter/xfilter/xftablestyle.cxx | 5
lotuswordpro/source/filter/xfilter/xftablestyle.hxx | 3
o3tl/qa/test-sorted_vector.cxx | 150 +-
odk/examples/java/DocumentHandling/Makefile | 2
offapi/com/sun/star/frame/XUntitledNumbers.idl | 2
officecfg/README | 2
oox/source/dump/dumperbase.cxx | 4
oox/source/helper/binaryinputstream.cxx | 2
oox/source/ole/vbainputstream.cxx | 2
package/source/xstor/xstorage.cxx | 2
registry/source/reflwrit.cxx | 4
registry/source/regimpl.cxx | 7
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 12
reportdesign/source/ui/dlg/Condition.cxx | 2
sal/osl/unx/profile.cxx | 2
sal/qa/osl/process/osl_Thread.cxx | 10
sal/qa/rtl/oustring/rtl_OUString2.cxx | 5
sal/qa/rtl/process/rtl_Process.cxx | 5
sal/qa/rtl/random/rtl_random.cxx | 50
sal/rtl/cipher.cxx | 36
sal/rtl/digest.cxx | 28
sal/rtl/random.cxx | 6
salhelper/source/timer.cxx | 2
sc/Library_sc.mk | 1
sc/inc/addincol.hxx | 5
sc/inc/appoptio.hxx | 7
sc/inc/attrib.hxx | 2
sc/inc/chartlis.hxx | 3
sc/inc/chartpos.hxx | 27
sc/inc/chgviset.hxx | 3
sc/inc/colcontainer.hxx | 35
sc/inc/dociter.hxx | 9
sc/inc/dpgroup.hxx | 3
sc/inc/dpresfilter.hxx | 2
sc/inc/dpsave.hxx | 4
sc/inc/dptabres.hxx | 15
sc/inc/dptabsrc.hxx | 3
sc/inc/editutil.hxx | 2
sc/inc/paramisc.hxx | 8
sc/inc/patattr.hxx | 7
sc/inc/prnsave.hxx | 5
sc/inc/rangenam.hxx | 7
sc/source/core/data/attrib.cxx | 11
sc/source/core/data/colcontainer.cxx | 28
sc/source/core/data/dociter.cxx | 26
sc/source/core/data/document.cxx | 4
sc/source/core/data/dpgroup.cxx | 3
sc/source/core/data/dpresfilter.cxx | 8
sc/source/core/data/dpsave.cxx | 14
sc/source/core/data/dptabres.cxx | 10
sc/source/core/data/dptabsrc.cxx | 8
sc/source/core/data/global2.cxx | 7
sc/source/core/data/patattr.cxx | 17
sc/source/core/data/table1.cxx | 2
sc/source/core/inc/addinlis.hxx | 2
sc/source/core/tool/addincol.cxx | 11
sc/source/core/tool/addinlis.cxx | 7
sc/source/core/tool/appoptio.cxx | 12
sc/source/core/tool/callform.cxx | 6
sc/source/core/tool/chartlis.cxx | 14
sc/source/core/tool/chartpos.cxx | 47
sc/source/core/tool/chgviset.cxx | 9
sc/source/core/tool/editutil.cxx | 5
sc/source/core/tool/prnsave.cxx | 5
sc/source/core/tool/rangenam.cxx | 9
sc/source/core/tool/rangeutl.cxx | 8
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/xeescher.cxx | 2
sc/source/filter/excel/xiescher.cxx | 4
sc/source/filter/excel/xistream.cxx | 8
sc/source/filter/excel/xlformula.cxx | 6
sc/source/filter/excel/xltools.cxx | 2
sc/source/filter/inc/fapihelper.hxx | 2
sc/source/filter/inc/xlformula.hxx | 2
sc/source/filter/lotus/lotread.cxx | 2
sc/source/filter/oox/biffcodec.cxx | 6
sc/source/filter/rtf/eeimpars.cxx | 7
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 2
sc/source/ui/app/scmod.cxx | 3
sc/source/ui/cctrl/dpcontrol.cxx | 2
sc/source/ui/condformat/condformatdlgentry.cxx | 4
sc/source/ui/dbgui/csvcontrol.cxx | 4
sc/source/ui/dbgui/csvgrid.cxx | 2
sc/source/ui/dbgui/csvruler.cxx | 2
sc/source/ui/dbgui/sortkeydlg.cxx | 2
sc/source/ui/docshell/externalrefmgr.cxx | 1
sc/source/ui/drawfunc/fuconrec.cxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 1
sc/source/ui/miscdlgs/conflictsdlg.cxx | 1
sc/source/ui/view/formatsh.cxx | 3
sc/source/ui/view/gridwin4.cxx | 2
sccomp/source/solver/LpsolveSolver.cxx | 6
scripting/source/stringresource/stringresource.cxx | 8
sd/source/core/PageListWatcher.cxx | 6
sd/source/filter/eppt/pptexsoundcollection.cxx | 7
sd/source/filter/html/htmlex.cxx | 4
sd/source/filter/ppt/pptin.cxx | 8
sd/source/filter/ppt/propread.cxx | 47
sd/source/ui/app/sdmod2.cxx | 4
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2
sd/source/ui/dlg/brkdlg.cxx | 9
sd/source/ui/dlg/copydlg.cxx | 12
sd/source/ui/dlg/custsdlg.cxx | 4
sd/source/ui/dlg/filedlg.cxx | 1
sd/source/ui/dlg/vectdlg.cxx | 14
sd/source/ui/docshell/docshel2.cxx | 5
sd/source/ui/func/fuconrec.cxx | 2
sd/source/ui/func/fucopy.cxx | 6
sd/source/ui/func/fumorph.cxx | 18
sd/source/ui/func/fuoaprms.cxx | 4
sd/source/ui/func/fupoor.cxx | 4
sd/source/ui/func/fusel.cxx | 4
sd/source/ui/func/fusldlg.cxx | 2
sd/source/ui/inc/BreakDlg.hxx | 2
sd/source/ui/inc/DrawViewShell.hxx | 2
sd/source/ui/remotecontrol/BluetoothServer.cxx | 2
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 2
sd/source/ui/unoidl/unomodel.cxx | 8
sd/source/ui/view/drawview.cxx | 2
sd/source/ui/view/drtxtob.cxx | 4
sd/source/ui/view/drviews4.cxx | 4
sd/source/ui/view/drviewsa.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 4
sd/source/ui/view/outlview.cxx | 12
sd/source/ui/view/sdview.cxx | 2
sd/source/ui/view/viewshel.cxx | 2
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 18
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 12
sdext/source/presenter/PresenterAccessibility.cxx | 2
sfx2/source/appl/appcfg.cxx | 1
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/bastyp/mieclip.cxx | 2
sfx2/source/control/bindings.cxx | 53
sfx2/source/control/dispatch.cxx | 1
sfx2/source/control/itemdel.cxx | 2
sfx2/source/dialog/backingwindow.cxx | 2
sfx2/source/dialog/dinfdlg.cxx | 8
sfx2/source/dialog/dockwin.cxx | 1
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/doc/graphhelp.cxx | 2
sfx2/source/doc/oleprops.cxx | 6
sfx2/source/sidebar/Theme.cxx | 2
shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx | 4
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 22
slideshow/source/engine/slide/targetpropertiescreator.cxx | 2
solenv/bin/install-gdb-printers | 3
solenv/bin/modules/installer/windows/file.pm | 4
solenv/gdb/libreoffice/vcl.py | 90 +
sot/source/sdstor/stg.cxx | 4
sot/source/sdstor/stgole.cxx | 4
starmath/source/mathmlexport.cxx | 12
starmath/source/node.cxx | 4
stoc/source/inspect/introspection.cxx | 7
stoc/test/testintrosp.cxx | 4
svl/source/numbers/zformat.cxx | 2
svtools/qa/unit/GraphicObjectTest.cxx | 2
svtools/source/contnr/imivctl1.cxx | 20
svtools/source/contnr/svimpbox.cxx | 2
svtools/source/contnr/svtabbx.cxx | 5
svtools/source/contnr/treelist.cxx | 2
svtools/source/contnr/treelistbox.cxx | 1
svtools/source/control/ruler.cxx | 6
svtools/source/control/tabbar.cxx | 5
svtools/source/control/toolbarmenu.cxx | 2
svtools/source/graphic/grfcache.cxx | 4
svtools/source/graphic/grfmgr.cxx | 258 +---
svtools/source/graphic/grfmgr2.cxx | 65 -
svtools/source/graphic/transformer.cxx | 4
svtools/source/misc/langtab.cxx | 2
svtools/source/svhtml/parhtml.cxx | 4
svx/source/customshapes/EnhancedCustomShape2d.cxx | 12
svx/source/customshapes/EnhancedCustomShape3d.cxx | 8
svx/source/dialog/_bmpmask.cxx | 2
svx/source/dialog/_contdlg.cxx | 6
svx/source/dialog/contimp.hxx | 2
svx/source/dialog/ctredlin.cxx | 2
svx/source/dialog/grfflt.cxx | 16
svx/source/engine3d/scene3d.cxx | 2
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/datanavi.cxx | 2
svx/source/form/fmshimp.cxx | 1
svx/source/form/fmvwimp.cxx | 4
svx/source/gallery2/codec.cxx | 4
svx/source/gallery2/galbrws2.cxx | 4
svx/source/gallery2/galobj.cxx | 8
svx/source/sdr/animation/animationstate.cxx | 2
svx/source/sdr/animation/scheduler.cxx | 2
svx/source/sdr/event/eventhandler.cxx | 2
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 9
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 12
svx/source/sdr/primitive3d/sdrattributecreator3d.cxx | 12
svx/source/sidebar/PanelLayout.cxx | 3
svx/source/sidebar/nbdtmg.cxx | 4
svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 8
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 2
svx/source/svdraw/polypolygoneditor.cxx | 4
svx/source/svdraw/sdrpagewindow.cxx | 4
svx/source/svdraw/sdrpaintwindow.cxx | 2
svx/source/svdraw/svdattr.cxx | 2
svx/source/svdraw/svdedtv.cxx | 2
svx/source/svdraw/svdedtv1.cxx | 8
svx/source/svdraw/svdedtv2.cxx | 40
svx/source/svdraw/svdedxv.cxx | 4
svx/source/svdraw/svdetc.cxx | 3
svx/source/svdraw/svdfmtf.cxx | 14
svx/source/svdraw/svdhdl.cxx | 4
svx/source/svdraw/svdmark.cxx | 8
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdmrkv.cxx | 2
svx/source/svdraw/svdoashp.cxx | 6
svx/source/svdraw/svdobj.cxx | 2
svx/source/svdraw/svdocapt.cxx | 2
svx/source/svdraw/svdocirc.cxx | 12
svx/source/svdraw/svdograf.cxx | 2
svx/source/svdraw/svdomeas.cxx | 8
svx/source/svdraw/svdomedia.cxx | 2
svx/source/svdraw/svdopath.cxx | 44
svx/source/svdraw/svdotext.cxx | 2
svx/source/svdraw/svdotextdecomposition.cxx | 18
svx/source/svdraw/svdotextpathdecomposition.cxx | 6
svx/source/svdraw/svdpagv.cxx | 2
svx/source/svdraw/svdpntv.cxx | 15
svx/source/svdraw/svdpoev.cxx | 2
svx/source/svdraw/svdsnpv.cxx | 2
svx/source/svdraw/svdviter.cxx | 2
svx/source/svdraw/svdxcgv.cxx | 2
svx/source/table/accessibletableshape.cxx | 4
svx/source/tbxctrls/linectrl.cxx | 4
svx/source/unodraw/unoshape.cxx | 2
svx/source/xoutdev/_xoutbmp.cxx | 28
svx/source/xoutdev/xattr.cxx | 4
svx/source/xoutdev/xattr2.cxx | 4
sw/qa/extras/ww8export/ww8export.cxx | 2
sw/source/core/access/accdoc.cxx | 4
sw/source/core/access/accframe.cxx | 2
sw/source/core/access/accfrmobjmap.cxx | 11
sw/source/core/access/accpara.cxx | 9
sw/source/core/access/acctable.cxx | 4
sw/source/core/crsr/crsrsh.cxx | 7
sw/source/core/doc/DocumentStatisticsManager.cxx | 1
sw/source/core/doc/DocumentTimerManager.cxx | 1
sw/source/core/doc/doccomp.cxx | 19
sw/source/core/doc/docnew.cxx | 1
sw/source/core/docnode/swbaslnk.cxx | 2
sw/source/core/frmedt/fecopy.cxx | 9
sw/source/core/frmedt/feshview.cxx | 2
sw/source/core/frmedt/fews.cxx | 4
sw/source/core/inc/frame.hxx | 6
sw/source/core/layout/anchoredobject.cxx | 2
sw/source/core/layout/atrfrm.cxx | 49
sw/source/core/layout/calcmove.cxx | 4
sw/source/core/layout/findfrm.cxx | 3
sw/source/core/layout/fly.cxx | 4
sw/source/core/layout/objectformatter.cxx | 2
sw/source/core/layout/objectformattertxtfrm.cxx | 2
sw/source/core/layout/pagechg.cxx | 2
sw/source/core/layout/paintfrm.cxx | 3
sw/source/core/layout/sectfrm.cxx | 2
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 2
sw/source/core/text/pormulti.cxx | 5
sw/source/core/txtnode/SwGrammarContact.cxx | 1
sw/source/core/txtnode/fntcache.cxx | 72 -
sw/source/core/unocore/unochart.cxx | 1
sw/source/core/unocore/unodraw.cxx | 5
sw/source/core/view/viewsh.cxx | 6
sw/source/filter/html/swhtml.cxx | 4
sw/source/filter/ww8/rtfattributeoutput.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 7
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/wrtw8sty.cxx | 9
sw/source/filter/ww8/wrtww8.cxx | 20
sw/source/filter/ww8/wrtww8.hxx | 6
sw/source/filter/ww8/wrtww8gr.cxx | 3
sw/source/filter/ww8/ww8par2.cxx | 11
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/ww8/ww8scan.cxx | 50
sw/source/filter/ww8/ww8scan.hxx | 9
sw/source/filter/ww8/ww8toolbar.cxx | 6
sw/source/filter/ww8/ww8toolbar.hxx | 5
sw/source/filter/xml/xmlexpit.cxx | 2
sw/source/filter/xml/xmlimpit.cxx | 2
sw/source/filter/xml/xmltble.cxx | 8
sw/source/filter/xml/xmltbli.cxx | 152 +-
sw/source/ui/chrdlg/chardlg.cxx | 3
sw/source/ui/index/cnttab.cxx | 4
sw/source/ui/index/swuiidxmrk.cxx | 4
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 7
sw/source/uibase/dochdl/swdtflvr.cxx | 2
sw/source/uibase/inc/swuiidxmrk.hxx | 4
sw/source/uibase/misc/redlndlg.cxx | 4
sw/source/uibase/misc/swruler.cxx | 1
sw/source/uibase/shells/drwbassh.cxx | 4
sw/source/uibase/uiview/view.cxx | 1
sw/source/uibase/uno/unotxdoc.cxx | 4
sw/source/uibase/wrtsh/delete.cxx | 2
tools/source/generic/b3dtrans.cxx | 8
tools/source/generic/poly.cxx | 19
tools/source/inet/inetmime.cxx | 7
tools/source/stream/stream.cxx | 12
tools/source/stream/strmwnt.cxx | 4
tools/source/stream/vcompat.cxx | 4
unotools/source/misc/datetime.cxx | 2
vbahelper/source/msforms/vbapages.hxx | 1
vcl/headless/svpbmp.cxx | 5
vcl/headless/svpglyphcache.cxx | 8
vcl/headless/svpinst.cxx | 2
vcl/headless/svpprn.cxx | 2
vcl/inc/BitmapScaleConvolution.hxx | 5
vcl/inc/bitmapfilter.hxx | 8
vcl/inc/bitmapscalesuper.hxx | 10
vcl/inc/canvasbitmap.hxx | 4
vcl/inc/controldata.hxx | 7
vcl/inc/headless/svpbmp.hxx | 1
vcl/inc/impbmp.hxx | 6
vcl/inc/impoctree.hxx | 48
vcl/inc/octree.hxx | 2
vcl/inc/opengl/salbmp.hxx | 1
vcl/inc/opengl/x11/salvd.hxx | 3
vcl/inc/quartz/salbmp.h | 1
vcl/inc/salbmp.hxx | 1
vcl/inc/svmconverter.hxx | 1
vcl/inc/unx/gendata.hxx | 1
vcl/inc/unx/geninst.h | 2
vcl/inc/unx/i18n_xkb.hxx | 6
vcl/inc/unx/salbmp.h | 1
vcl/inc/win/salbmp.h | 1
vcl/inc/win/salgdi.h | 4
vcl/inc/win/wincomp.hxx | 2
vcl/opengl/gdiimpl.cxx | 2
vcl/opengl/scale.cxx | 5
vcl/opengl/x11/salvd.cxx | 3
vcl/osx/HtmlFmtFlt.cxx | 2
vcl/qa/cppunit/BitmapTest.cxx | 2
vcl/qa/cppunit/jpeg/JpegReaderTest.cxx | 2
vcl/quartz/salbmp.cxx | 5
vcl/source/app/help.cxx | 10
vcl/source/app/svapp.cxx | 2
vcl/source/app/timer.cxx | 3
vcl/source/bitmap/BitmapProcessor.cxx | 25
vcl/source/bitmap/BitmapScaleConvolution.cxx | 14
vcl/source/bitmap/bitmapfilter.cxx | 2
vcl/source/bitmap/bitmapscalesuper.cxx | 162 +-
vcl/source/control/button.cxx | 15
vcl/source/control/combobox.cxx | 2
vcl/source/control/ctrl.cxx | 8
vcl/source/control/edit.cxx | 20
vcl/source/control/field.cxx | 3
vcl/source/control/fixed.cxx | 4
vcl/source/control/group.cxx | 2
vcl/source/control/imp_listbox.cxx | 6
vcl/source/control/listbox.cxx | 2
vcl/source/control/longcurr.cxx | 2
vcl/source/control/notebookbar.cxx | 2
vcl/source/control/quickselectionengine.cxx | 1
vcl/source/control/scrbar.cxx | 1
vcl/source/control/spinfld.cxx | 4
vcl/source/control/tabctrl.cxx | 16
vcl/source/edit/textdata.cxx | 9
vcl/source/edit/textdoc.cxx | 23
vcl/source/edit/texteng.cxx | 1
vcl/source/filter/graphicfilter.cxx | 6
vcl/source/filter/graphicfilter2.cxx | 2
vcl/source/filter/igif/gifread.cxx | 84 -
vcl/source/filter/ixbm/xbmread.cxx | 24
vcl/source/filter/ixpm/xpmread.cxx | 42
vcl/source/filter/jpeg/JpegWriter.cxx | 14
vcl/source/filter/jpeg/JpegWriter.hxx | 2
vcl/source/filter/jpeg/transupp.c | 2
vcl/source/filter/sgf.ini | 2
vcl/source/filter/sgvmain.cxx | 16
vcl/source/filter/sgvmain.hxx | 4
vcl/source/filter/sgvtext.cxx | 2
vcl/source/filter/wmf/winmtf.cxx | 14
vcl/source/filter/wmf/winwmf.cxx | 10
vcl/source/filter/wmf/wmfwr.hxx | 2
vcl/source/fontsubset/cff.cxx | 6
vcl/source/gdi/alpha.cxx | 31
vcl/source/gdi/animate.cxx | 10
vcl/source/gdi/bitmap.cxx | 618 ++++------
vcl/source/gdi/bitmap3.cxx | 191 +--
vcl/source/gdi/bitmap4.cxx | 121 -
vcl/source/gdi/bitmapex.cxx | 71 -
vcl/source/gdi/bmpacc.cxx | 40
vcl/source/gdi/bmpacc2.cxx | 48
vcl/source/gdi/dibtools.cxx | 550 ++++----
vcl/source/gdi/embeddedfontshelper.cxx | 2
vcl/source/gdi/gdimtf.cxx | 4
vcl/source/gdi/graph.cxx | 12
vcl/source/gdi/impanmvw.cxx | 4
vcl/source/gdi/impbmp.cxx | 8
vcl/source/gdi/impgraph.cxx | 19
vcl/source/gdi/impvect.cxx | 47
vcl/source/gdi/metaact.cxx | 24
vcl/source/gdi/oldprintadaptor.cxx | 1
vcl/source/gdi/pdffontcache.hxx | 1
vcl/source/gdi/pdfwriter_impl.cxx | 30
vcl/source/gdi/pdfwriter_impl.hxx | 7
vcl/source/gdi/pdfwriter_impl2.cxx | 4
vcl/source/gdi/pngread.cxx | 107 -
vcl/source/gdi/pngwrite.cxx | 24
vcl/source/gdi/print.cxx | 2
vcl/source/gdi/print2.cxx | 8
vcl/source/gdi/print3.cxx | 1
vcl/source/gdi/salgdilayout.cxx | 10
vcl/source/helper/canvasbitmap.cxx | 9
vcl/source/outdev/bitmap.cxx | 96 -
vcl/source/outdev/outdev.cxx | 2
vcl/source/outdev/rect.cxx | 16
vcl/source/outdev/text.cxx | 8
vcl/source/outdev/textline.cxx | 2
vcl/source/outdev/transparent.cxx | 22
vcl/source/outdev/wallpaper.cxx | 8
vcl/source/window/commandevent.cxx | 17
vcl/source/window/cursor.cxx | 1
vcl/source/window/dialog.cxx | 1
vcl/source/window/dockingarea.cxx | 5
vcl/source/window/dockmgr.cxx | 3
vcl/source/window/dockwin.cxx | 9
vcl/source/window/floatwin.cxx | 5
vcl/source/window/menubarwindow.hxx | 1
vcl/source/window/menufloatingwindow.cxx | 9
vcl/source/window/msgbox.cxx | 4
vcl/source/window/popupmenuwindow.cxx | 5
vcl/source/window/printdlg.cxx | 6
vcl/source/window/scrwnd.cxx | 23
vcl/source/window/seleng.cxx | 1
vcl/source/window/splitwin.cxx | 1
vcl/source/window/status.cxx | 5
vcl/source/window/syswin.cxx | 24
vcl/source/window/tabdlg.cxx | 2
vcl/source/window/tabpage.cxx | 2
vcl/source/window/toolbox.cxx | 12
vcl/source/window/window2.cxx | 1
vcl/source/window/winproc.cxx | 6
vcl/source/window/wrkwin.cxx | 2
vcl/unx/generic/app/geninst.cxx | 9
vcl/unx/generic/app/i18n_im.cxx | 5
vcl/unx/generic/dtrans/X11_selection.hxx | 1
vcl/unx/generic/dtrans/bmp.cxx | 8
vcl/unx/generic/gdi/salbmp.cxx | 5
vcl/unx/generic/print/common_gfx.cxx | 2
vcl/unx/generic/print/genprnpsp.cxx | 2
vcl/unx/generic/printer/ppdparser.cxx | 1
vcl/unx/generic/printer/printerinfomanager.cxx | 6
vcl/unx/generic/window/salframe.cxx | 5
vcl/win/gdi/salbmp.cxx | 13
vcl/win/gdi/salgdi.cxx | 14
vcl/win/window/salobj.cxx | 4
vcl/workben/fftester.cxx | 34
vcl/workben/outdevgrind.cxx | 2
vcl/workben/vcldemo.cxx | 10
winaccessibility/source/UAccCOM/MAccessible.cxx | 4
winaccessibility/source/service/AccComponentEventListener.cxx | 2
writerperfect/source/common/WPXSvInputStream.cxx | 4
xmloff/source/core/nmspmap.cxx | 6
xmloff/source/core/unoatrcn.cxx | 12
xmloff/source/draw/xexptran.cxx | 4
xmloff/source/forms/property_meta_data.cxx | 2
xmloff/source/style/fonthdl.cxx | 6
xmloff/source/style/xmlnumi.cxx | 2
xmloff/source/text/txtparae.cxx | 4
xmloff/source/text/txtparai.cxx | 4
705 files changed, 4501 insertions(+), 4537 deletions(-)
New commits:
commit ac328157460e9e6a9ca6834e8233a28e845c2806
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Mon Nov 27 19:56:35 2017 -0500
pdf: use bimap for GraphicsContext-id map
In some large PDFs the two maps for
mapping GraphicsContext to ID and finding
GraphicsContext given and ID are huge (over
160 MB in one case). By using a bimap the
footprint went down to 110 MB.
Change-Id: I59a444b5efa09fcabc26fa492de723ca063e14a4
Reviewed-on: https://gerrit.libreoffice.org/45380
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 551543bf359f644f727fd1aa86e2c5ae499f88ce)
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index dbc94360ca61..bf805fc2b512 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -45,7 +45,6 @@
#include <com/sun/star/geometry/RealPoint2D.hpp>
#include <com/sun/star/geometry/RealRectangle2D.hpp>
-
using namespace com::sun::star;
@@ -65,7 +64,6 @@ namespace pdfi
m_aFontToId(),
m_aGCStack(),
m_nNextGCId( 1 ),
- m_aIdToGC(),
m_aGCToId(),
m_aImages(),
m_nPages(0),
@@ -83,8 +81,7 @@ namespace pdfi
GraphicsContext aDefGC;
m_aGCStack.push_back( aDefGC );
- m_aIdToGC[ 0 ] = aDefGC;
- m_aGCToId[ aDefGC ] = 0;
+ m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0));
}
void PDFIProcessor::enableToplevelText()
@@ -483,13 +480,12 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const
sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
{
sal_Int32 nGCId = 0;
- GCToIdMap::const_iterator it = m_aGCToId.find( rGC );
- if( it != m_aGCToId.end() )
+ auto it = m_aGCToId.left.find( rGC );
+ if( it != m_aGCToId.left.end() )
nGCId = it->second;
else
{
- m_aGCToId[ rGC ] = m_nNextGCId;
- m_aIdToGC[ m_nNextGCId ] = rGC;
+ m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId));
nGCId = m_nNextGCId;
m_nNextGCId++;
}
@@ -499,9 +495,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const
{
- IdToGCMap::const_iterator it = m_aIdToGC.find( nGCId );
- if( it == m_aIdToGC.end() )
- it = m_aIdToGC.find( 0 );
+ auto it = m_aGCToId.right.find( nGCId );
+ if( it == m_aGCToId.right.end() )
+ it = m_aGCToId.right.find( 0 );
return it->second;
}
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 1588b057d9c3..0225336dcf31 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -46,6 +46,9 @@
#include "treevisitorfactory.hxx"
#include "genericelements.hxx"
+#include <boost/bimap/bimap.hpp>
+#include <boost/bimap/unordered_set_of.hpp>
+
namespace pdfi
{
@@ -170,8 +173,10 @@ namespace pdfi
typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
- typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
- typedef std::unordered_map<GraphicsContext,sal_Int32,GraphicsContextHash> GCToIdMap;
+ typedef boost::bimaps::bimap<
+ boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>,
+ boost::bimaps::unordered_set_of<sal_Int32>
+ > GCToIdBiMap;
typedef std::vector<GraphicsContext> GraphicsContextStack;
@@ -186,8 +191,7 @@ namespace pdfi
GraphicsContextStack m_aGCStack;
sal_Int32 m_nNextGCId;
- IdToGCMap m_aIdToGC;
- GCToIdMap m_aGCToId;
+ GCToIdBiMap m_aGCToId;
ImageContainer m_aImages;
commit ded39dc17a34127a872b11abddc32bbbb5aae047
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Sat Nov 25 13:44:21 2017 -0500
pixman: drop cached glyphs above size watermark
The glyphs cache only tracked the number of glyphs
in the cache, which isn't very useful when the
glyphs vary in size from a few bytes to dozens of
megabytes. In terms of memory footprint, we are
interested not just in the number of cached glyphs,
but also in the total memory usage.
We now track the pixel-size of each glyph and drop
as many as necessary to fall below the set threshold
which is currently 4 MBs.
There was no performance loss observed after this patch
on a diverse set of documents of all types (if anything,
a very modest performance win was hinted in some cases),
with significant memory reduction in some cases where
dozens of megabytes were previously left stale in the cache.
Change-Id: I377a4c1e59611fca6bf253dd9fa90f75b5295d4b
Reviewed-on: https://gerrit.libreoffice.org/45378
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 407660a08c8df27d7cd44435eefa31bd92364a3c)
diff --git a/external/cairo/pixman/pixman-0.24.4.patch b/external/cairo/pixman/pixman-0.24.4.patch
index 520f2ba572d4..6d871e37bfd1 100644
--- a/external/cairo/pixman/pixman-0.24.4.patch
+++ b/external/cairo/pixman/pixman-0.24.4.patch
@@ -18,4 +18,74 @@
+#include <limits.h>
#include "pixman-private.h"
-
+
+--- misc/pixman-0.24.4/pixman/pixman-glyph.c 2015-06-30 05:48:31.000000000 -0400
++++ misc/build/pixman-0.24.4/pixman/pixman-glyph.c 2017-11-25 13:26:33.075558418 -0500
+@@ -38,6 +38,7 @@
+
+ /* XXX: These numbers are arbitrary---we've never done any measurements.
+ */
++#define N_PIXELS_HIGH_WATER (4 * 1024 * 1024)
+ #define N_GLYPHS_HIGH_WATER (16384)
+ #define N_GLYPHS_LOW_WATER (8192)
+ #define HASH_SIZE (2 * N_GLYPHS_HIGH_WATER)
+@@ -58,6 +59,7 @@
+ int n_glyphs;
+ int n_tombstones;
+ int freeze_count;
++ long n_pixels;
+ pixman_list_t mru;
+ glyph_t * glyphs[HASH_SIZE];
+ };
+@@ -133,6 +135,7 @@
+ if (*loc == TOMBSTONE)
+ cache->n_tombstones--;
+ cache->n_glyphs++;
++ cache->n_pixels += glyph->image->bits.width * glyph->image->bits.height;
+
+ *loc = glyph;
+ }
+@@ -150,6 +153,7 @@
+ cache->glyphs[idx & HASH_MASK] = TOMBSTONE;
+ cache->n_tombstones++;
+ cache->n_glyphs--;
++ cache->n_pixels -= glyph->image->bits.width * glyph->image->bits.height;
+
+ /* Eliminate tombstones if possible */
+ if (cache->glyphs[(idx + 1) & HASH_MASK] == NULL)
+@@ -180,6 +184,7 @@
+
+ cache->n_glyphs = 0;
+ cache->n_tombstones = 0;
++ cache->n_pixels = 0;
+ }
+
+ PIXMAN_EXPORT pixman_glyph_cache_t *
+@@ -194,6 +199,7 @@
+ cache->n_glyphs = 0;
+ cache->n_tombstones = 0;
+ cache->freeze_count = 0;
++ cache->n_pixels = 0;
+
+ pixman_list_init (&cache->mru);
+
+@@ -220,9 +226,9 @@
+ pixman_glyph_cache_thaw (pixman_glyph_cache_t *cache)
+ {
+ if (--cache->freeze_count == 0 &&
+- cache->n_glyphs + cache->n_tombstones > N_GLYPHS_HIGH_WATER)
++ (cache->n_glyphs + cache->n_tombstones > N_GLYPHS_HIGH_WATER || cache->n_pixels > N_PIXELS_HIGH_WATER))
+ {
+- if (cache->n_tombstones > N_GLYPHS_HIGH_WATER)
++ if (cache->n_tombstones > N_GLYPHS_LOW_WATER)
+ {
+ /* More than half the entries are
+ * tombstones. Just dump the whole table.
+@@ -230,7 +236,7 @@
+ clear_table (cache);
+ }
+
+- while (cache->n_glyphs > N_GLYPHS_LOW_WATER)
++ while (cache->n_glyphs > N_GLYPHS_LOW_WATER || cache->n_pixels > N_PIXELS_HIGH_WATER)
+ {
+ glyph_t *glyph = CONTAINER_OF (glyph_t, mru_link, cache->mru.tail);
commit f64ff421a338ac22981f7fa93166f179c158a4d0
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Wed Nov 22 22:17:37 2017 -0500
sc: simplify ScColContainer
Less clutter, no indirection and smaller memory footprint.
Change-Id: Ic24272e9853a7af28df62298fd26e7edce554986
Reviewed-on: https://gerrit.libreoffice.org/45379
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 7c8c2b5e3a569d60375975d6fbad32e3c3c48c9d)
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 329fe87840b8..a36b6a9fc37e 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -107,7 +107,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/data/cellvalues \
sc/source/core/data/clipcontext \
sc/source/core/data/clipparam \
- sc/source/core/data/colcontainer \
sc/source/core/data/column \
sc/source/core/data/column2 \
sc/source/core/data/column3 \
diff --git a/sc/inc/colcontainer.hxx b/sc/inc/colcontainer.hxx
index 0f4a64589cdd..8165c6ff42ff 100644
--- a/sc/inc/colcontainer.hxx
+++ b/sc/inc/colcontainer.hxx
@@ -22,30 +22,34 @@
#include "types.hxx"
#include "address.hxx"
+#include "column.hxx"
#include <vector>
-class ScColumn;
-class ScDocument;
-
-class ScColContainer
+class ScColContainer final
{
- typedef std::vector<ScColumn*> ScColumnVector;
- ScColumnVector aCols;
- ScDocument* pDocument;
+ std::vector<ScColumn> aCols;
public:
- ScColContainer( ScDocument* pDoc, const size_t nSize );
- ~ScColContainer();
+
+ ScColContainer(const size_t nSize)
+ : aCols(nSize)
+ {
+ }
+
+ ~ScColContainer()
+ {
+ Clear();
+ }
const ScColumn& operator[] ( const size_t nIndex ) const
{
- return *aCols[nIndex];
+ return aCols[nIndex];
}
ScColumn& operator[] ( const size_t nIndex )
{
- return *aCols[nIndex];
+ return aCols[nIndex];
}
SCCOL size() const
@@ -58,9 +62,14 @@ public:
return aCols.empty();
}
- void Clear();
-};
+ void Clear()
+ {
+ for (ScColumn& rCol: aCols)
+ rCol.PrepareBroadcastersForDestruction();
+ aCols.clear();
+ }
+};
#endif
diff --git a/sc/source/core/data/colcontainer.cxx b/sc/source/core/data/colcontainer.cxx
index 7433240c8999..b2f93e975edd 100644
--- a/sc/source/core/data/colcontainer.cxx
+++ b/sc/source/core/data/colcontainer.cxx
@@ -18,32 +18,4 @@
*/
-#include "colcontainer.hxx"
-#include "column.hxx"
-#include "document.hxx"
-
-ScColContainer::ScColContainer( ScDocument* pDoc, const size_t nSize )
-{
- pDocument = pDoc;
- aCols.resize( nSize );
- for ( size_t nCol = 0; nCol < nSize; ++nCol )
- aCols[nCol] = new ScColumn;
-}
-
-ScColContainer::~ScColContainer()
-{
- Clear();
-}
-
-
-void ScColContainer::Clear()
-{
- SCCOL nSize = size();
- for ( SCCOL nIdx = 0; nIdx < nSize; ++nIdx )
- {
- aCols[nIdx]->PrepareBroadcastersForDestruction();
- delete aCols[nIdx];
- }
- aCols.clear();
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 7e54e1e16743..472078f5ea21 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -237,7 +237,7 @@ bool SetOptimalHeightsToRows(
ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName,
bool bColInfo, bool bRowInfo ) :
- aCol( pDoc, MAXCOLCOUNT ),
+ aCol( MAXCOLCOUNT ),
aName( rNewName ),
aCodeName( rNewName ),
nLinkRefreshDelay( 0 ),
commit 4912f1c16b73cb40e8c473da60317598fcc55d5a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Oct 16 11:08:47 2017 +0100
ofz: optimize 1bit mask to avoid timeout
Change-Id: Ieaf3eb0800d2e80f16cfa29718d752e43ad534d0
Reviewed-on: https://gerrit.libreoffice.org/43418
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 035751dd33550def4a269a01eaae74fcaf8f5ecc)
Reviewed-on: https://gerrit.libreoffice.org/45457
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit ac5ecfeb5dd8578ca37876b6e0b23911d7cdae1c)
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index e7490fb846f8..b29d94f6d4d9 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -1144,7 +1144,6 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const
if( !nTol )
{
const BitmapColor aTest( pReadAcc->GetBestMatchingColor( rTransColor ) );
- long nX, nY;
if( pReadAcc->GetScanlineFormat() == ScanlineFormat::N4BitMsnPal ||
pReadAcc->GetScanlineFormat() == ScanlineFormat::N4BitLsnPal )
@@ -1157,12 +1156,11 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const
aWhite.GetIndex() == 1 )
{
// optimized for 1Bit-MSB destination palette
- for( nY = 0; nY < nHeight; nY++ )
+ for (long nY = 0; nY < nHeight; ++nY)
{
Scanline pSrc = pReadAcc->GetScanline( nY );
Scanline pDst = pWriteAcc->GetScanline( nY );
- long nShift = 0;
- for( nX = 0, nShift = nShiftInit; nX < nWidth; nX++, nShift ^= 4 )
+ for (long nX = 0, nShift = nShiftInit; nX < nWidth; nX++, nShift ^= 4)
{
if( cTest == ( ( pSrc[ nX >> 1 ] >> nShift ) & 0x0f ) )
pDst[ nX >> 3 ] |= 1 << ( 7 - ( nX & 7 ) );
@@ -1173,11 +1171,10 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const
}
else
{
- for( nY = 0; nY < nHeight; nY++ )
+ for (long nY = 0; nY < nHeight; ++nY)
{
Scanline pSrc = pReadAcc->GetScanline( nY );
- long nShift = 0;
- for( nX = 0, nShift = nShiftInit; nX < nWidth; nX++, nShift ^= 4 )
+ for (long nX = 0, nShift = nShiftInit; nX < nWidth; nX++, nShift ^= 4)
{
if( cTest == ( ( pSrc[ nX >> 1 ] >> nShift ) & 0x0f ) )
pWriteAcc->SetPixel( nY, nX, aWhite );
@@ -1196,11 +1193,11 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const
aWhite.GetIndex() == 1 )
{
// optimized for 1Bit-MSB destination palette
- for( nY = 0; nY < nHeight; nY++ )
+ for (long nY = 0; nY < nHeight; ++nY)
{
Scanline pSrc = pReadAcc->GetScanline( nY );
Scanline pDst = pWriteAcc->GetScanline( nY );
- for( nX = 0; nX < nWidth; nX++ )
+ for (long nX = 0; nX < nWidth; ++nX)
{
if( cTest == pSrc[ nX ] )
pDst[ nX >> 3 ] |= 1 << ( 7 - ( nX & 7 ) );
@@ -1211,10 +1208,10 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const
}
else
{
- for( nY = 0; nY < nHeight; nY++ )
+ for (long nY = 0; nY < nHeight; ++nY)
{
Scanline pSrc = pReadAcc->GetScanline( nY );
- for( nX = 0; nX < nWidth; nX++ )
+ for (long nX = 0; nX < nWidth; ++nX)
{
if( cTest == pSrc[ nX ] )
pWriteAcc->SetPixel( nY, nX, aWhite );
@@ -1224,12 +1221,25 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const
}
}
}
+ else if (pWriteAcc->GetScanlineFormat() == pReadAcc->GetScanlineFormat() && aWhite.GetIndex() == 1 &&
+ (pReadAcc->GetScanlineFormat() == ScanlineFormat::N1BitLsbPal || pReadAcc->GetScanlineFormat() == ScanlineFormat::N1BitMsbPal))
+ {
+ for (long nY = 0; nY < nHeight; ++nY)
+ {
+ Scanline pSrc = pReadAcc->GetScanline(nY);
+ Scanline pDst = pWriteAcc->GetScanline(nY);
+ assert(pWriteAcc->GetScanlineSize() == pReadAcc->GetScanlineSize());
+ const long nScanlineSize = pWriteAcc->GetScanlineSize();
+ for (long nX = 0; nX < nScanlineSize; ++nX)
+ pDst[nX] = ~pSrc[nX];
+ }
+ }
else
{
// not optimized
- for( nY = 0; nY < nHeight; nY++ )
+ for (long nY = 0; nY < nHeight; ++nY)
{
- for( nX = 0; nX < nWidth; nX++ )
+ for (long nX = 0; nX < nWidth; ++nX)
{
if( aTest == pReadAcc->GetPixel( nY, nX ) )
pWriteAcc->SetPixel( nY, nX, aWhite );
commit f5b16fc3aa7540759e6e959dbf664dd83d2f87e4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Sep 27 14:22:45 2017 +0200
simplify Bitmap operator==/IsEqual (stage2)
Now that we've sorted out which bits are rightfully internal (see commit
7a4064cf87d23bffac987b3e39bf87d9b4d158fc), and which bits need a
comparison operator, rename IsEqual to operator==.
Change-Id: Iec229a7571d76ee18fbc0a4fe672cc2e50a44948
Reviewed-on: https://gerrit.libreoffice.org/42851
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit 09917566b6ce86ea65a246f2055b5d1f41df4e76)
Reviewed-on: https://gerrit.libreoffice.org/45456
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit f641e9d9f472110ccb61c01210e8acf280ad9bf3)
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 2b908310596d..43d8fdd2eddb 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -716,7 +716,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
const Graphic* pGraphic = rOldItem.GetGraphic();
if (pGraphic)
- bModifyBrush = !pGraphic->GetBitmap().IsEqual(aBgdGraphic.GetBitmap());
+ bModifyBrush = pGraphic->GetBitmap() != aBgdGraphic.GetBitmap();
}
if (bModifyBrush)
{
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 275d4f87526c..476ca9d06939 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -46,9 +46,8 @@ public:
AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); }
AlphaMask& operator=( AlphaMask&& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( std::move(rAlphaMask) ) ); }
bool operator!() const { return Bitmap::operator!(); }
- bool operator==( const AlphaMask& rAlphaMask ) const = delete;
- bool operator!=( const AlphaMask& rAlphaMask ) const = delete;
- bool IsEqual( const AlphaMask& rAlphaMask ) const { return Bitmap::IsEqual(rAlphaMask); }
+ bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==(rAlphaMask); }
+ bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=(rAlphaMask); }
void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); }
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 74932051bcc4..7534c154aa38 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -229,10 +229,8 @@ public:
Bitmap& operator=( const Bitmap& rBitmap );
Bitmap& operator=( Bitmap&& rBitmap );
inline bool operator!() const;
- bool operator==( const Bitmap& rBitmap ) const = delete;
- bool operator!=( const Bitmap& rBitmap ) const = delete;
-
- bool IsEqual( const Bitmap& rBmp ) const;
+ bool operator==( const Bitmap& rBitmap ) const;
+ bool operator!=( const Bitmap& rBitmap ) const { return !operator==(rBitmap); }
inline bool IsEmpty() const;
void SetEmpty();
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index e1bd4914ed78..7c8913ef3cf4 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -744,8 +744,8 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m
const Graphic* pGrf2 = pBrsh2->GetGraphic();
if (pGrf1==pGrf2) bIsMatch = true;
if (pGrf1 && pGrf2) {
- if ( pGrf1->GetBitmap().IsEqual(pGrf2->GetBitmap()) &&
- _pSet->aSize==aFmt.GetGraphicSize())
+ if ( pGrf1->GetBitmap() == pGrf2->GetBitmap() &&
+ _pSet->aSize == aFmt.GetGraphicSize())
bIsMatch = true;
}
}
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 15e2b0a15c95..e7490fb846f8 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -239,7 +239,7 @@ Bitmap& Bitmap::operator=( Bitmap&& rBitmap )
return *this;
}
-bool Bitmap::IsEqual( const Bitmap& rBmp ) const
+bool Bitmap::operator==( const Bitmap& rBmp ) const
{
return rBmp.mxImpBmp == mxImpBmp || // Includes both are nullptr
(rBmp.mxImpBmp && mxImpBmp && mxImpBmp->ImplIsEqual(*rBmp.mxImpBmp));
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 4d7bb0a8bc55..26f4b40df3f4 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -206,7 +206,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
if( eTransparent != rBitmapEx.eTransparent )
return false;
- if( !aBitmap.IsEqual(rBitmapEx.aBitmap) )
+ if( aBitmap != rBitmapEx.aBitmap )
return false;
if( aBitmapSize != rBitmapEx.aBitmapSize )
@@ -218,7 +218,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
if( eTransparent == TransparentType::Color )
return aTransparentColor == rBitmapEx.aTransparentColor;
- return aMask.IsEqual(rBitmapEx.aMask) && bAlpha == rBitmapEx.bAlpha;
+ return aMask == rBitmapEx.aMask && bAlpha == rBitmapEx.bAlpha;
}
bool BitmapEx::IsEmpty() const
commit c30f0d7eb04e6ddc9c1522a745e3bd3bdd622643
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Sep 27 11:36:18 2017 +0200
simplify Bitmap operator==/IsEqual (stage1)
It looks like operator== is actually only useful internally. So inline
that, and rename the other call sites to use IsEqual().
As a second stage, I will rename IsEqual to operator==, the intention
being to make it obvious how the call sites are modified.
Change-Id: I37f2920a8cafaffb25e8c5c16e6559546206684b
Reviewed-on: https://gerrit.libreoffice.org/42846
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit 404630c6052919c1a0b5dab405084c2a39fc2f5c)
Reviewed-on: https://gerrit.libreoffice.org/45455
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 00f776ba53975fea14faa78ffa7b06e7bf5fbf6b)
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 43d8fdd2eddb..2b908310596d 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -716,7 +716,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
const Graphic* pGraphic = rOldItem.GetGraphic();
if (pGraphic)
- bModifyBrush = pGraphic->GetBitmap() != aBgdGraphic.GetBitmap();
+ bModifyBrush = !pGraphic->GetBitmap().IsEqual(aBgdGraphic.GetBitmap());
}
if (bModifyBrush)
{
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 9e3f49784bd5..275d4f87526c 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -46,8 +46,9 @@ public:
AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( rAlphaMask ) ); }
AlphaMask& operator=( AlphaMask&& rAlphaMask ) { return static_cast<AlphaMask&>( Bitmap::operator=( std::move(rAlphaMask) ) ); }
bool operator!() const { return Bitmap::operator!(); }
- bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); }
- bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); }
+ bool operator==( const AlphaMask& rAlphaMask ) const = delete;
+ bool operator!=( const AlphaMask& rAlphaMask ) const = delete;
+ bool IsEqual( const AlphaMask& rAlphaMask ) const { return Bitmap::IsEqual(rAlphaMask); }
void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); }
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index bc17cbc70c13..74932051bcc4 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -229,8 +229,8 @@ public:
Bitmap& operator=( const Bitmap& rBitmap );
Bitmap& operator=( Bitmap&& rBitmap );
inline bool operator!() const;
- inline bool operator==( const Bitmap& rBitmap ) const;
- inline bool operator!=( const Bitmap& rBitmap ) const;
+ bool operator==( const Bitmap& rBitmap ) const = delete;
+ bool operator!=( const Bitmap& rBitmap ) const = delete;
bool IsEqual( const Bitmap& rBmp ) const;
@@ -751,16 +751,6 @@ inline bool Bitmap::operator!() const
return( mxImpBmp == nullptr );
}
-inline bool Bitmap::operator==( const Bitmap& rBitmap ) const
-{
- return( rBitmap.mxImpBmp == mxImpBmp );
-}
-
-inline bool Bitmap::operator!=( const Bitmap& rBitmap ) const
-{
- return( rBitmap.mxImpBmp != mxImpBmp );
-}
-
inline bool Bitmap::IsEmpty() const
{
return( mxImpBmp == nullptr );
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index c0ab50050668..15e2b0a15c95 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -786,7 +786,7 @@ bool Bitmap::CopyPixel( const Rectangle& rRectDst,
if( !aRectDst.IsEmpty() )
{
- if( pBmpSrc && ( *pBmpSrc != *this ) )
+ if( pBmpSrc && ( pBmpSrc->mxImpBmp != mxImpBmp ) )
{
Bitmap* pSrc = const_cast<Bitmap*>(pBmpSrc);
const Size aCopySizePix( pSrc->GetSizePixel() );
@@ -965,7 +965,7 @@ bool Bitmap::CopyPixel_AlphaOptimized( const Rectangle& rRectDst, const Rectangl
if( !aRectDst.IsEmpty() )
{
- if( pBmpSrc && ( *pBmpSrc != *this ) )
+ if( pBmpSrc && ( pBmpSrc->mxImpBmp != mxImpBmp ) )
{
Bitmap* pSrc = const_cast<Bitmap*>(pBmpSrc);
const Size aCopySizePix( pSrc->GetSizePixel() );
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index f8def3cdc1b8..4d7bb0a8bc55 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -206,7 +206,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
if( eTransparent != rBitmapEx.eTransparent )
return false;
- if( aBitmap != rBitmapEx.aBitmap )
+ if( !aBitmap.IsEqual(rBitmapEx.aBitmap) )
return false;
if( aBitmapSize != rBitmapEx.aBitmapSize )
@@ -218,7 +218,7 @@ bool BitmapEx::operator==( const BitmapEx& rBitmapEx ) const
if( eTransparent == TransparentType::Color )
return aTransparentColor == rBitmapEx.aTransparentColor;
- return( ( aMask == rBitmapEx.aMask ) && ( bAlpha == rBitmapEx.bAlpha ) );
+ return aMask.IsEqual(rBitmapEx.aMask) && bAlpha == rBitmapEx.bAlpha;
}
bool BitmapEx::IsEmpty() const
commit d87778376321abac9de5ad4bc79bf2b35c679738
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date: Sun Sep 24 22:54:11 2017 +0200
Fix typos
Reviewed-on: https://gerrit.libreoffice.org/42726
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
(cherry picked from commit e44c188a7353cc183fac8ece0cbf3611d842835e)
Change-Id: I879a52820d78d9151ef64dd21612379f617f66e2
Reviewed-on: https://gerrit.libreoffice.org/45454
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 50e37a41acae8597fdb097715f8b76b16bce9f31)
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index b0c901dc3c47..963d9675e2eb 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -203,7 +203,7 @@ TitleWrapper::TitleWrapper( ::chart::TitleHelper::eTitleType eTitleType,
m_eTitleType(eTitleType)
{
ControllerLockGuardUNO aCtrlLockGuard( Reference< frame::XModel >( m_spChart2ModelContact->getChart2Document(), uno::UNO_QUERY ));
- if( !getTitleObject().is() ) //#i83831# create an empty title at the model, thus references to properties can be mapped mapped correctly
+ if( !getTitleObject().is() ) //#i83831# create an empty title at the model, thus references to properties can be mapped correctly
TitleHelper::createTitle( m_eTitleType, OUString(), m_spChart2ModelContact->getChartModel(), m_spChart2ModelContact->m_xContext );
}
diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx
index 6a2d37d8477e..b8ade04817d8 100644
--- a/chart2/source/controller/main/UndoGuard.hxx
+++ b/chart2/source/controller/main/UndoGuard.hxx
@@ -31,7 +31,7 @@
namespace chart
{
-/** A guard which which does nothing, unless you explicitly call commitAction. In particular, in its destructor, it
+/** A guard which does nothing, unless you explicitly call commitAction. In particular, in its destructor, it
does neither auto-commit nor auto-rollback the model changes.
*/
class UndoGuard
diff --git a/cli_ure/qa/climaker/ClimakerTestCase.java b/cli_ure/qa/climaker/ClimakerTestCase.java
index e994d014e1eb..b90c3844b471 100644
--- a/cli_ure/qa/climaker/ClimakerTestCase.java
+++ b/cli_ure/qa/climaker/ClimakerTestCase.java
@@ -65,7 +65,7 @@ public class ClimakerTestCase extends ComplexTestCase
}
-/* This reads reads from an InputStream and discards the data.
+/* This read from an InputStream and discards the data.
*/
class Reader extends Thread
{
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 1523333f4f4e..a2531a166e1e 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -427,7 +427,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvent
aEvt.ListenerType = aEvt.ListenerType.copy(nLastDot+1);
aIt->aEventList.push_back( aEvt );
- // register new new Event
+ // register new Event
for( auto& rObj : aIt->aObjList )
{
Reference< XAllListener > xAll =
diff --git a/compilerplugins/clang/store/cascadingassignop.cxx b/compilerplugins/clang/store/cascadingassignop.cxx
index 0a88b0ca6402..1d08217f177e 100644
--- a/compilerplugins/clang/store/cascadingassignop.cxx
+++ b/compilerplugins/clang/store/cascadingassignop.cxx
@@ -21,7 +21,7 @@ operators, which are errorprone, e.g.
However, it finds 556 cases in sw/source alone, thus likely needs some more
restricting, e.g. by checking for multiline conditional operator statements or
a certain length in characters (but that needs the Context/SourceManager, which
-I havent played with yet).
+I haven't played with yet).
*/
// the value is rather arbitrary, but code above this number of stmts begins to
diff --git a/compilerplugins/clang/store/cascadingcondop.cxx b/compilerplugins/clang/store/cascadingcondop.cxx
index 722b9819b60b..c868e5e468a2 100644
--- a/compilerplugins/clang/store/cascadingcondop.cxx
+++ b/compilerplugins/clang/store/cascadingcondop.cxx
@@ -21,7 +21,7 @@ operators, which are errorprone, e.g.
However, it finds 556 cases in sw/source alone, thus likely needs some more
restricting, e.g. by checking for multiline conditional operator statements or
a certain length in characters (but that needs the Context/SourceManager, which
-I havent played with yet).
+I haven't played with yet).
*/
// the value is rather arbitrary, but code above this number of stmts begins to
diff --git a/configure.ac b/configure.ac
index 8b8bc3bf26b9..e7075dfd4a36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2202,7 +2202,7 @@ AC_ARG_WITH(compat-oowrappers,
AC_ARG_WITH(os-version,
AS_HELP_STRING([--with-os-version=<OSVERSION>],
- [For FreeBSD users, use this option option to override the detected OSVERSION.]),
+ [For FreeBSD users, use this option to override the detected OSVERSION.]),
,)
AC_ARG_WITH(mingw-cross-compiler,
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index f98dcd57367a..0ffdeb818637 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -159,8 +159,8 @@ namespace connectivity { namespace hsqldb
Reference< XResultSet > xResult( xStatement->executeQuery( aCommand.makeStringAndClear() ), UNO_QUERY_THROW );
if ( !xResult->next() )
{
- // hmm. There is no view view the name as we know it. Can only mean some other instance
- // dropped this view meanwhile ...
+ // hmm. There is no view the name as we know it. Can only mean some other instance
+ // dropped this view meanwhile...
throw DisposedException();
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 5a26a659bfa1..4675f7c45a38 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -2185,7 +2185,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, voi
IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox&, rListBox, void )
{
- //column break or break break after
+ //column break or break after
sal_Int32 nBreakPos = m_pBreakPositionLB->GetSelectEntryPos();
if ( rListBox.GetSelectEntryPos() == 1 || 1 == nBreakPos)
{
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 5b794a91955c..11bd6d7847cc 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -305,7 +305,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
Reference< XConnection > xCon( m_xConnection, UNO_SET_THROW );
m_xMetaData.set( xCon->getMetaData(), UNO_SET_THROW );
- // create a table table filter suitable for the XDatabaseMetaData::getTables call,
+ // create a table filter suitable for the XDatabaseMetaData::getTables call,
// taking into account both the externally-provided table type filter, and any
// table type restriction which is inherent to the container
Sequence< OUString > aTableTypeFilter;
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 880bf029fbdb..625441b5eba4 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -484,7 +484,7 @@ OUString MigrationImpl::preXDGConfigDir(const OUString& rConfigDir)
// we would need to weigh results from the current config dir against matches in
// the 'old' config dir etc. ) - currently we just use the returned config dir.
// If XDG_CONFIG_HOME is NOT set;
- // assume then we should now using the default $HOME/,config config location for
+ // assume then we should now using the default $HOME/.config config location for
// our user profiles, however *all* previous libreoffice and openoffice.org
// configurations will be in the 'old' config directory and that's where we need
// to search - we convert the returned config dir to the 'old' dir
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index a6f01d9b5a0d..645e007903d2 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.hxx
@@ -40,7 +40,7 @@
// IDropSource::QueryContinueDrag, to actions as are declared in
// css::datatransfer::dnd::DNDConstants ( ACTION_MOVE etc).
// If the grfKeyState indicates the ALt or right mousebutton then the returned
-// values combines all possible actions. This is because those key and button are
+// values combines all possible actions. This is because those keys and buttons are
// used when the user expect a menu to appear when he drops. The menu then
// contains entries, such as move, copy, link, cancel.
// An odd fact is that the argument grfKeyState in IDropTarget::Drop does not
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 88de578a07ba..f61a9f986a4a 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -936,7 +936,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow()
@descr We need a parent to support some functionality! e.g. findFrame()
By the way we use the chance to set an internal information about our top state.
So we must not check this information during every isTop() call.
- We are top, if our parent is the desktop instance or we havent any parent.
+ We are top, if our parent is the desktop instance or we haven't any parent.
@seealso getCreator()
@seealso findFrame()
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index d4a9d8099de2..c16a7283bca5 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -198,7 +198,7 @@ void SessionListener::StoreSession( bool bAsync )
xDispatch->dispatch(aURL, args);
} catch (const css::uno::Exception& e) {
SAL_WARN("fwk.session",e.Message);
- // save failed, but tell manager to go on if we havent yet dispatched the request
+ // save failed, but tell manager to go on if we haven't yet dispatched the request
// in case of synchronous saving the notification is done by the caller
if ( bAsync && m_rSessionManager.is() )
m_rSessionManager->saveDone(this);
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 7af2f9e68fda..9ebacee01612 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -139,12 +139,12 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
of this collection. (fragmentation!) If collection is full (means there
is no free number) the special value INVALID_NUMBER will be returned.
- @note Those method can't be called within a multithreaded environment ..
- Because such number wont be "reserved" for the calli of these method
- it can happen that two calls returns the same number (reasoned by the fact that first calli
+ @note Those method can't be called within a multithreaded environment.
+ Because such number won't be "reserved" for the call of these method
+ it can happen that two calls returns the same number (reasoned by the fact that first call
doesn't used the returned number already.
- So the outside code has to make sure that retrieving and using of those number
+ So the outside code has to make sure that retrieving and using of those numbers
will be an atomic operation.
@return an unique number or special value INVALID_NUMBER if collection is full.
diff --git a/odk/examples/java/DocumentHandling/Makefile b/odk/examples/java/DocumentHandling/Makefile
index 08e8f0f79ee8..d8eff760d450 100644
--- a/odk/examples/java/DocumentHandling/Makefile
+++ b/odk/examples/java/DocumentHandling/Makefile
@@ -91,7 +91,7 @@ $(APP4_JAR) : $(SAMPLE_CLASS_OUT)/$(APP4_NAME).mf $(SAMPLE_CLASS_OUT)/$(APP4_NAM
$(SAMPLE_NAME) : $(APP1_JAR) $(APP2_JAR) $(APP3_JAR) $(APP4_JAR)
@echo --------------------------------------------------------------------------------
@echo The $(APP1_NAME) search the "$(QM)./test$(QM)" directory for documents, convert
- @echo them using using the "$(QM)MS Word 97$(QM)" filter and the extension "$(QM).doc$(QM)".
+ @echo them using the "$(QM)MS Word 97$(QM)" filter and the extension "$(QM).doc$(QM)".
@echo The converted files are store in "$(QM)$(SAMPLE_GEN_OUT)/converted_files$(QM)".
@echo The list of possible filter names can change. Normally an updated list can be found
@echo on "$(QM)http://www.openoffice.org/files/documents/25/111/filter_description.html$(QM)".
diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl
index 231707b5e7b2..19fbbca9eddf 100644
--- a/offapi/com/sun/star/frame/XUntitledNumbers.idl
+++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl
@@ -46,7 +46,7 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
long leaseNumber ( [in] com::sun::star::uno::XInterface xComponent )
raises (com::sun::star::lang::IllegalArgumentException);
- /** has to be used to mark those number as "free for using".
+ /** has to be used to mark those numbers as "free for using".
If the registered component does not use such leased number any longer
it has to be released so it can be used for new components.
diff --git a/officecfg/README b/officecfg/README
index 712bd439f2d0..5720fe1cd15a 100644
--- a/officecfg/README
+++ b/officecfg/README
@@ -1,6 +1,6 @@
The schema and default settings for the OpenOffice.org configuration database.
-If you change change a file in this module, then a make postprocess is needed after make officecfg.
+If you change a file in this module, then a make postprocess is needed after make officecfg.
See also:
[[configmgr]]
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index d0c470e55ebf..dedf4a15ce6b 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -3509,7 +3509,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream(
m_pImpl->AddLog( THROW_WHERE "Rethrow" );
uno::Any aCaught( ::cppu::getCaughtException() );
- throw embed::StorageWrappedTargetException( THROW_WHERE "Can't open encrypted stream stream!",
+ throw embed::StorageWrappedTargetException( THROW_WHERE "Can't open encrypted stream!",
uno::Reference< io::XInputStream >(),
aCaught );
}
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index bd72185fc9ac..1a12becb6076 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -399,8 +399,8 @@ sub generate_unique_filename_for_filetable
$uniquefilename =~ s/\-/\_/g; # no "-" allowed
$uniquefilename =~ s/\@/\_/g; # no "@" allowed
$uniquefilename =~ s/\$/\_/g; # no "$" allowed
- $uniquefilename =~ s/^\s*\./\_/g; # no "." at the beginning allowed allowed
- $uniquefilename =~ s/^\s*\d/\_d/g; # no number at the beginning allowed allowed (even file "0.gif", replacing to "_d.gif")
+ $uniquefilename =~ s/^\s*\./\_/g; # no "." at the beginning allowed
+ $uniquefilename =~ s/^\s*\d/\_d/g; # no number at the beginning allowed (even file "0.gif", replacing to "_d.gif")
$uniquefilename =~ s/org_openoffice_/ooo_/g; # shorten the unique file name
my $lcuniquefilename = lc($uniquefilename); # only lowercase names
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 2a70bf95ceb4..888f4f4fa8c1 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -414,7 +414,7 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper
bool bBroadcastChanged = false;
const AVMediaSetMask nMaskSet = rNewProperties.getMaskSet();
- // use only a subset of MediaItem properties for own own properties
+ // use only a subset of MediaItem properties for own properties
if( AVMediaSetMask::MIME_TYPE & nMaskSet )
m_xImpl->m_MediaProperties.setMimeType( rNewProperties.getMimeType() );
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 3e0c93af6e9e..80f4ca21d25c 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -63,7 +63,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
//call fist all not SwNoTextFrames, then the SwNoTextFrames.
// The reason is, that in the SwNoTextFrames the Graphic
// after a Paint will be swapped out! So all other "behind"
- // them havent't a loaded Graphic.
+ // them haven't a loaded Graphic.
rGrfNd.LockModify();
{
SwIterator<SwClient,SwGrfNode> aIter(rGrfNd);
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index ecf2b2acc3f8..34c0519b2f5a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -644,7 +644,7 @@ FlyProcessingState SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)
const sal_Int32 nPos = rAnchor.nContent.GetIndex();
if ( nPos != nSwPos )
- return FLY_NOT_PROCESSED ; //We havent processed the fly
+ return FLY_NOT_PROCESSED ; // We haven't processed the fly
const SdrObject* pSdrObj = maFlyIter->GetFrameFormat().FindRealSdrObject();
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 0b5bfdaf51e5..ba9c7e8d743d 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2400,8 +2400,8 @@ void WW8TabDesc::CalcDefaults()
/*
If the last cell was "false" then there is no valid cell following it,
- so the default mapping forward wont't work. So map it (and
- contiguous invalid cells backwards to the last valid cell instead.
+ so the default mapping forward won't work. So map it (and
+ contiguous invalid cells backwards to the last valid cell instead.)
*/
if (i && !pR->bExist[i-1])
{
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index bfe724c2f8ca..dd94e4af505e 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2987,7 +2987,7 @@ the same sprmCMajority as appears before 0x6f in word 6/95
I think the easiest explanation is that the CJK Word for Window 95, or whatever
the product was went rogue, and did their own things with at least first three
slots after sprmCMajority to do a different thing. I have no reason to think Tono
-was wrong with what they do in the a698<->a699 versions versions, but with magic
+was wrong with what they do in the a698<->a699 versions, but with magic
a5dc they probably did mean sprmCFBoldBi, sprmCFItalicBi cause they have that 0x81
pattern which has significance for those types of properties.
*/
diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index 9804dbd32e1f..929b3ec0afb4 100644
--- a/vcl/osx/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star::uno;
// well known under MS Windows
// the MS HTML Format has a header before the real html data
-// Version:1.0 Version number of the clipboard. Staring is 0.9
+// Version:1.0 Version number of the clipboard. Starting is 0.9
// StartHTML: Byte count from the beginning of the clipboard to the start
// of the context, or -1 if no context
// EndHTML: Byte count from the beginning of the clipboard to the end
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 0d2f5f1aa644..c0ab50050668 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -1126,7 +1126,7 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const
if (!nTol && pReadAcc && (pReadAcc->GetScanlineFormat() == ScanlineFormat::N1BitLsbPal || pReadAcc->GetScanlineFormat() == ScanlineFormat::N1BitMsbPal)
&& pReadAcc->GetBestMatchingColor(Color(COL_WHITE)) == pReadAcc->GetBestMatchingColor(rTransColor))
{
- //if we're a 1 bit pixel already, and the transcolor matches the color that would replace it already already, then just return a copy
+ //if we're a 1 bit pixel already, and the transcolor matches the color that would replace it already, then just return a copy
return *this;
}
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index b771073ed958..61586680c413 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -49,7 +49,7 @@ GraphicsStatus::GraphicsStatus() :
}
/*
- * non graphics graphics routines
+ * non graphics routines
*/
void
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 6c190eeb9a86..f85f19137905 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -523,7 +523,7 @@ public:
#define SET(font,string) { font, reinterpret_cast<const char *>(string) }
SET("sans", "a"), // logical font - no 'sans' font.
SET("opensymbol", "#$%"), // font fallback - $ is missing.
- SET("sans", pInvalid), // unicode invalid character character
+ SET("sans", pInvalid), // unicode invalid character
// tdf#96266 - stacking diacritics
SET("carlito", pDiacritic1),
SET("carlito", pDiacritic2),
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index 39fb61103cf7..2f1929a3fdee 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -175,7 +175,7 @@ void AccComponentEventListener::SetComponentState(short state, bool enable)
{
pAgent->UpdateState(m_xAccessible.get());
pAgent->DecreaseState(m_xAccessible.get(), AccessibleStateType::DEFUNC);
- // 8. label should have no FOCUSABLE state state, Firefox has READONLY state, we can also have.
+ // 8. label should have no FOCUSABLE state, Firefox has READONLY state, we can also have.
if ( GetRole() != AccessibleRole::LABEL
&& GetRole() != AccessibleRole::SCROLL_BAR)
{
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index 496a929b5cc8..23fb31b78b8f 100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -64,7 +64,7 @@ namespace xmloff { namespace metadata
// TODO: instead of having all of the below static, it should be some per-instance data. This way, the
// approach used here would scale much better.
// That is, if you have multiple "meta data instances", which manage a small, but closed set of properties,
- // then looking looking through those multiple instances would probably be faster than searching within
+ // then looking through those multiple instances would probably be faster than searching within
// one big instance, since in this case, every instance can quickly decide whether it is responsible
// for some attribute or property, and otherwise delegate to the next instance.
commit 981bee0c5656c0e3339c1df7007c57fde9ac270d
Author: Johnny_M <klasse at partyheld.de>
Date: Sun Sep 10 21:40:52 2017 +0200
Translate German comments/debug strings (leftovers in dirs vbahelper and vcl)
Translates leftovers found using a custom regex.
Additionally:
- Translated the "SGV Fonts for StarView" INI file parameter group
in vcl/source/filter/sgf.ini and .../sgvtext.cxx
Reviewed-on: https://gerrit.libreoffice.org/42145
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 59010ca14ba07f0a1d6f662bb1f8fbad33f3c654)
Change-Id: I1360aac1a2f3fa825f86d77ac1b05e2de9ffb007
Reviewed-on: https://gerrit.libreoffice.org/45453
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 7bd77b9306f0fc6908b715683b2e3b90cc4b75d6)
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index ac6cfdd26cab..f707254efa92 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -216,7 +216,7 @@ void SvpSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
for( ::std::list< OUString >::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it )
{
const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) );
- // Neuen Eintrag anlegen
+ // create new entry
SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
pInfo->maPrinterName = *it;
pInfo->maDriver = rInfo.m_aDriverName;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 14310f90411e..4204a0954d53 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -232,7 +232,7 @@ private:
bool mbFontKernInit; // FALSE: FontKerns must be queried
KERNINGPAIR* mpFontKernPairs; // Kerning Pairs of the current Font
sal_uIntPtr mnFontKernPairCount;// Number of Kerning Pairs of the current Font
- int mnPenWidth; // Linienbreite
+ int mnPenWidth; // line width
LogicalFontInstance* GetWinFontEntry(int nFallbackLevel);
@@ -412,7 +412,7 @@ public:
// pFont: describes from which font to create a subset
// pGlyphIDs: the glyph ids to be extracted
// pEncoding: the character code corresponding to each glyph
- // pWidths: the advance widths of the correspoding glyphs (in PS font units)
+ // pWidths: the advance widths of the corresponding glyphs (in PS font units)
// nGlyphs: the number of glyphs
// rInfo: additional outgoing information
// implementation note: encoding 0 with glyph id 0 should be added implicitly
diff --git a/vcl/inc/win/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index 87aae83e9cfc..b404aa532365 100644
--- a/vcl/inc/win/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -196,7 +196,7 @@ inline HINSTANCE GetWindowInstance( HWND hWnd )
#endif
-// - 5.0-Erweiterungen -
+// - 5.0 extensions -
#ifndef COLOR_GRADIENTACTIVECAPTION
#define COLOR_GRADIENTACTIVECAPTION 27
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 153abc29e371..a531c11bfde0 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -631,7 +631,7 @@ void ImplSetHelpWindowPos( vcl::Window* pHelpWin, sal_uInt16 nHelpWinStyle, Quic
pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( rHelpArea.TopLeft() ),
pHelpWin->GetParent()->ImplGetFrameWindow()->OutputToAbsoluteScreenPixel( rHelpArea.BottomRight() ) );
- // Welche Position vom Rechteck?
+ // which position of the rectangle?
aPos = devHelpArea.Center();
if ( nStyle & QuickHelpFlags::Left )
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 7691a4c4feed..f0dea4402d79 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2631,7 +2631,7 @@ bool RadioButton::SetModeRadioImage( const Image& rImage )
void RadioButton::SetState( bool bCheck )
{
- // TabStop-Flag richtig mitfuehren
+ // carry the TabStop flag along correctly
if ( bCheck )
mpWindowImpl->mnStyle |= WB_TABSTOP;
else
@@ -3711,7 +3711,7 @@ Size CheckBox::CalcMinimumSize( long nMaxWidth ) const
{
// is this still correct ? since the checkbox now
// shows a focus rect it should be 2 pixels wider and longer
-/* da ansonsten im Writer die Control zu weit oben haengen
+/* since otherwise the controls in the Writer hang too far up
aSize.Width() += 2;
aSize.Height() += 2;
*/
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index aacd1d21cc75..ead5bc57b965 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -219,9 +219,9 @@ void TextNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNew )
}
}
- SAL_WARN_IF( rAttrib.GetStart() > rAttrib.GetEnd(), "vcl", "Expand: Attribut verdreht!" );
- SAL_WARN_IF( ( rAttrib.GetEnd() > maText.getLength() ), "vcl", "Expand: Attrib groesser als Absatz!" );
- SAL_WARN_IF( rAttrib.IsEmpty(), "vcl", "Leeres Attribut nach ExpandAttribs?" );
+ SAL_WARN_IF( rAttrib.GetStart() > rAttrib.GetEnd(), "vcl", "Expand: attribute twisted!" );
+ SAL_WARN_IF( ( rAttrib.GetEnd() > maText.getLength() ), "vcl", "Expand: attribute greater than paragraph!" );
+ SAL_WARN_IF( rAttrib.IsEmpty(), "vcl", "Empty attribute after ExpandAttribs?" );
}
if ( bResort )
@@ -274,8 +274,8 @@ void TextNode::CollapseAttribs( sal_Int32 nIndex, sal_Int32 nDeleted )
}
}
- SAL_WARN_IF( rAttrib.GetStart() > rAttrib.GetEnd(), "vcl", "Collaps: Attribut verdreht!" );
- SAL_WARN_IF( ( rAttrib.GetEnd() > maText.getLength()) && !bDelAttr, "vcl", "Collaps: Attrib groesser als Absatz!" );
+ SAL_WARN_IF( rAttrib.GetStart() > rAttrib.GetEnd(), "vcl", "Collaps: attribute twisted!" );
+ SAL_WARN_IF( ( rAttrib.GetEnd() > maText.getLength()) && !bDelAttr, "vcl", "Collaps: attribute greater than paragraph!" );
if ( bDelAttr /* || rAttrib.IsEmpty() */ )
{
bResort = true;
@@ -491,8 +491,8 @@ sal_Int32 TextDoc::GetTextLen( const sal_Unicode* pSep, const TextSelection* pSe
TextPaM TextDoc::InsertText( const TextPaM& rPaM, sal_Unicode c )
{
- SAL_WARN_IF( c == 0x0A, "vcl", "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" );
- SAL_WARN_IF( c == 0x0D, "vcl", "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" );
+ SAL_WARN_IF( c == 0x0A, "vcl", "TextDoc::InsertText: Line separator in paragraph not allowed!" );
+ SAL_WARN_IF( c == 0x0D, "vcl", "TextDoc::InsertText: Line separator in paragraph not allowed!" );
TextNode* pNode = maTextNodes[ rPaM.GetPara() ];
pNode->InsertText( rPaM.GetIndex(), c );
@@ -503,8 +503,8 @@ TextPaM TextDoc::InsertText( const TextPaM& rPaM, sal_Unicode c )
TextPaM TextDoc::InsertText( const TextPaM& rPaM, const OUString& rStr )
{
- SAL_WARN_IF( rStr.indexOf( 0x0A ) != -1, "vcl", "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" );
- SAL_WARN_IF( rStr.indexOf( 0x0D ) != -1, "vcl", "TextDoc::InsertText: Zeilentrenner in Absatz nicht erlaubt!" );
+ SAL_WARN_IF( rStr.indexOf( 0x0A ) != -1, "vcl", "TextDoc::InsertText: Line separator in paragraph not allowed!" );
+ SAL_WARN_IF( rStr.indexOf( 0x0D ) != -1, "vcl", "TextDoc::InsertText: Line separator in paragraph not allowed!" );
TextNode* pNode = maTextNodes[ rPaM.GetPara() ];
pNode->InsertText( rPaM.GetIndex(), rStr );
diff --git a/vcl/source/filter/sgf.ini b/vcl/source/filter/sgf.ini
index 17c01255b6f1..2068c5f46e5a 100644
--- a/vcl/source/filter/sgf.ini
+++ b/vcl/source/filter/sgf.ini
@@ -20,7 +20,7 @@
#CharSet : (Ansi,IBMPC,Mac,Symbol,System); Default is System
#Attribute: (Bold,Ital,Sans,Serf,Fixd);
-[SGV Fonts fuer StarView]
+[SGV Fonts for StarView]
#IF-ID Fontname Attribute SV-Fam ChSet Width FontName
3848=(ITC Zapf Dingbats) Decora ()
5720=(Symbol) Serf Decora Symbol ()
diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx
index 08450f1be117..df5229bc259b 100644
--- a/vcl/source/filter/sgvmain.hxx
+++ b/vcl/source/filter/sgvmain.hxx
@@ -123,8 +123,8 @@ public:
sal_uInt8 Kapit; // 1..255%
sal_uInt16 Schnitt; // 8 flags
sal_uInt16 LnFeed; // 1..32767% of max font size of the line
- sal_uInt16 Slant; // slant angle 0.00..89.99deg default 15.00deg viewed double width)
- sal_uInt8 ZAbst; // character spacing 0..255% (0=on the line; 100=normal; 200=Zeichen wird als
+ sal_uInt16 Slant; // slant angle 0.00..89.99deg default 15.00deg
+ sal_uInt8 ZAbst; // character spacing 0..255% (0=on the line; 100=normal; 200=character is viewed as double width)
signed char ChrVPos; // vertical position of char. Default 0=on baseline, 10=5Pt below (-64..63")
ObjLineType ShdL; // shadow outline (new 2.0)
ObjAreaType ShdF; // shadow inside (new 2.0)
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 404dd4206c9b..9fcf62dba545 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -1101,7 +1101,7 @@ void SgfFontLst::ReadList()
LastLn=nullptr;
SgfFontOne* P,P1;
Config aCfg(FNam);
- aCfg.SetGroup("SGV Fonts fuer StarView");
+ aCfg.SetGroup("SGV Fonts for StarView");
sal_uInt16 Anz=aCfg.GetKeyCount();
sal_uInt16 i;
OString FID;
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 7b8eb97e03a7..0d2f5f1aa644 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -576,7 +576,7 @@ bool Bitmap::Mirror( BmpMirrorFlags nMirrorFlags )
}
}
- // ggf. noch mittlere Zeile horizontal spiegeln
+ // if necessary, also mirror the middle line horizontally
if( nHeight & 1 )
{
for( long nX = 0, nOtherX = nWidth1, nWidth_2 = nWidth >> 1; nX < nWidth_2; nX++, nOtherX-- )
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index cfa8b7521c38..9b09e649a706 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -710,7 +710,7 @@ void MenuFloatingWindow::ImplScroll( const Point& rMousePos )
}
void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, bool bStartPopupTimer )
{
- // #57934# ggf. immediately close the active, as TH's backgroundstorage works.
+ // #57934# if necessary, immediately close the active, as TH's backgroundstorage works.
// #65750# we prefer to refrain from the background storage of small lines.
// otherwise the menus are difficult to operate.
// MenuItemData* pNextData = pMenu->pItemList->GetDataFromPos( n );
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 6c97b1f29c1e..6a2b8cbaeb64 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -89,7 +89,7 @@ void TabDialog::ImplPosControls()
aTabSize.Height() + IMPL_DIALOG_OFFSET*2 + nOffY );
long nBtnEx = 0;
- // consider Preview-Fenster and adapt the sizes/offsets
+ // consider preview window and adapt the sizes/offsets
if ( mpViewWindow && mpViewWindow->IsVisible() )
{
long nViewOffX = 0;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 82d81a6ecbd3..47bcab8697c9 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1785,7 +1785,7 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl, void*, void)
if ( pSVData->maWinData.mpFocusWin == pFocusWin )
{
- // FocusWindow umsetzen
+ // transfer the FocusWindow
vcl::Window* pOverlapWindow = pFocusWin->ImplGetFirstOverlapWindow();
pOverlapWindow->ImplGetWindowImpl()->mpLastFocusWindow = pFocusWin;
pSVData->maWinData.mpFocusWin = nullptr;
@@ -1793,7 +1793,7 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl, void*, void)
if ( pFocusWin->ImplGetWindowImpl()->mpCursor )
pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide();
- // Deaktivate rufen
+ // call the Deactivate
vcl::Window* pOldFocusWindow = pFocusWin;
if ( pOldFocusWindow )
{
@@ -2483,7 +2483,7 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE
bInQueryExit = true;
if ( GetpApp()->QueryExit() )
{
- // Message-Schleife beenden
+ // end the message loop
Application::Quit();
return false;
}
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index d0cedec3ed20..3d7ad0ae5eb1 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -442,7 +442,7 @@ void SalGenericInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
for( ::std::list< OUString >::iterator it = aPrinters.begin(); it != aPrinters.end(); ++it )
{
const PrinterInfo& rInfo( rManager.getPrinterInfo( *it ) );
- // Neuen Eintrag anlegen
+ // create new entry
SalPrinterQueueInfo* pInfo = new SalPrinterQueueInfo;
pInfo->maPrinterName = *it;
pInfo->maDriver = rInfo.m_aDriverName;
diff --git a/vcl/win/window/salobj.cxx b/vcl/win/window/salobj.cxx
index f21dfb7ade9d..ace9847dc87c 100644
--- a/vcl/win/window/salobj.cxx
+++ b/vcl/win/window/salobj.cxx
@@ -70,7 +70,7 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd )
WinSalObject* pObject = ImplFindSalObject( hWnd );
if ( pObject )
{
- // Dazugehoerenden Frame suchen
+ // find matching frame
HWND hWnd2 = ::GetParent( pObject->mhWnd );
pFrame = GetSalData()->mpFirstFrame;
while ( pFrame )
@@ -585,7 +585,7 @@ WinSalObject::~WinSalObject()
pTempObject->mpNextObject = mpNextObject;
}
- // Cache-Daten zerstoeren
+ // destroy cache data
delete [] reinterpret_cast<BYTE*>(mpStdClipRgnData);
HWND hWndParent = ::GetParent( mhWnd );
commit 116fca4a4cb01cfb646f2271daccaac76b90d423
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Aug 16 16:27:55 2017 +0200
remove UL/L suffixes from integer constants on the RHS of expressions
Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit 2e8acde112e1c6754df26902e79a78346ba45a2d)
Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/45452
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
(cherry picked from commit 2887aefa4d4f60ba8b0cd7efd5d3a73ffb209781)
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index ed81ea37b194..85adbcdbcb03 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -673,7 +673,7 @@ namespace basegfx
const sal_uInt32 nInitialDivisions(3);
B2DPolygon aInitialPolygon;
- // as start make a fix division, creates nInitialDivisions + 2L points
+ // as start make a fix division, creates nInitialDivisions + 2 points
aInitialPolygon.append(getStartPoint());
adaptiveSubdivideByCount(aInitialPolygon, nInitialDivisions);
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 5b230e147c73..1cbc5bdd38b7 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -216,7 +216,7 @@ RTLFUNC(Error)
else
{
nCode = rPar.Get( 1 )->GetLong();
- if( nCode > 65535L )
+ if( nCode > 65535 )
{
StarBASIC::Error( ERRCODE_BASIC_CONVERSION );
}
diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx
index ce994947389e..f56b914d4272 100644
--- a/basic/source/runtime/props.cxx
+++ b/basic/source/runtime/props.cxx
@@ -51,7 +51,7 @@ RTLFUNC(Err)
if( bWrite )
{
sal_Int32 nVal = rPar.Get( 0 )->GetLong();
- if( nVal <= 65535L )
+ if( nVal <= 65535 )
StarBASIC::Error( StarBASIC::GetSfxFromVBError( (sal_uInt16) nVal ) );
}
else
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 4e6375cdd26b..48de7a980d47 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -596,10 +596,10 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
//if th object is a polygon
//from each point a handle is generated
const ::basegfx::B2DPolyPolygon& rPolyPolygon = static_cast<SdrPathObj*>(m_pMarkObj)->GetPathPoly();
- for( sal_uInt32 nN = 0L; nN < rPolyPolygon.count(); nN++)
+ for( sal_uInt32 nN = 0; nN < rPolyPolygon.count(); nN++)
{
const ::basegfx::B2DPolygon aPolygon(rPolyPolygon.getB2DPolygon(nN));
- for( sal_uInt32 nM = 0L; nM < aPolygon.count(); nM++)
+ for( sal_uInt32 nM = 0; nM < aPolygon.count(); nM++)
{
const ::basegfx::B2DPoint aPoint(aPolygon.getB2DPoint(nM));
SdrHdl* pHdl = new SdrHdl(Point(basegfx::fround(aPoint.getX()), basegfx::fround(aPoint.getY())), SdrHdlKind::Poly);
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index acc486a6a88a..1c6045477035 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -136,7 +136,7 @@ sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException, std::
{
return true;
}
- else if (fetchStat == 100L) // END OF DATASET
+ else if (fetchStat == 100) // END OF DATASET
{
m_bIsAfterLastRow = true;
return false;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index b4eb31b072d1..f61bceeb9780 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -241,7 +241,7 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol )
return pColorList->GetIndex( pColorEntry->GetName() );
}
}
- return -1L;
+ return -1;
}
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 713c4bd52bcd..1399e832569c 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -164,7 +164,7 @@ namespace drawinglayer
fState = 1.0;
}
- const double fIndex(fState * (double)(nSize - 1L));
+ const double fIndex(fState * (double)(nSize - 1));
const sal_uInt32 nIndA(sal_uInt32(floor(fIndex)));
const double fOffset(fIndex - (double)nIndA);
basegfx::B2DHomMatrix aTargetTransform;
@@ -178,7 +178,7 @@ namespace drawinglayer
else
{
// interpolate. Get involved buffered decomposed matrices
- const sal_uInt32 nIndB((nIndA + 1L) % nSize);
+ const sal_uInt32 nIndB((nIndA + 1) % nSize);
std::vector< basegfx::tools::B2DHomMatrixBufferedDecompose >::const_iterator aMatB(maMatrixStack.begin() + nIndB);
// interpolate for fOffset [0.0 .. 1.0[
diff --git a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
index e0b344a32130..22ed808772c0 100644
--- a/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitive2d.cxx
@@ -34,7 +34,7 @@ namespace drawinglayer
{
void GraphicPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& ) const
{
- if(255L == getGraphicAttr().GetTransparency())
+ if(255 == getGraphicAttr().GetTransparency())
{
// content is invisible, done
return;
diff --git a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
index 4c48cf70b815..5813b47573da 100644
--- a/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
+++ b/drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx
@@ -121,9 +121,9 @@ namespace drawinglayer
// Bad trap: There are animated gifs with no set WaitTime (!).
// In that case use a default value.
- if (0L == nWaitTime)
+ if (0 == nWaitTime)
{
- nWaitTime = 100L;
+ nWaitTime = 100;
}
return nWaitTime;
@@ -405,7 +405,7 @@ namespace drawinglayer
// create frame representation in VirtualDevices
if (nIndex >= nLen)
{
- nIndex = nLen - 1L;
+ nIndex = nLen - 1;
}
// check buffering shortcuts, may already be created
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
index 2b899afd7b01..af9a1a08aae3 100644
--- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx
+++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx
@@ -84,7 +84,7 @@ namespace
ImpTimedRefDev::~ImpTimedRefDev()
{
- OSL_ENSURE(0L == mnUseCount, "destruction of a still used ImpTimedRefDev (!)");
+ OSL_ENSURE(0 == mnUseCount, "destruction of a still used ImpTimedRefDev (!)");
const SolarMutexGuard aSolarGuard;
mpVirDev.disposeAndClear();
}
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index c580ffdfd73a..05cebc2ef693 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -363,8 +363,8 @@ namespace drawinglayer
for(sal_uInt32 a(0L); a < nVerSeg; a++)
{
- const bool bFirst(0L == a);
- const bool bLast(a + 1L == nVerSeg);
+ const bool bFirst(0 == a);
+ const bool bLast(a + 1 == nVerSeg);
if(bFirst || !bLast)
{
diff --git a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
index 4de490ac1e89..b546d8b0c544 100644
--- a/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx
@@ -91,24 +91,24 @@ namespace drawinglayer
if(bObjectSpecificX || bObjectSpecificY)
{
// object-specific
- for(sal_uInt32 a(0L); a < aFill.count(); a++)
+ for(sal_uInt32 a(0); a < aFill.count(); a++)
{
basegfx::B3DPolygon aTmpPoly(aFill.getB3DPolygon(a));
- if(aTmpPoly.count() >= 4L)
+ if(aTmpPoly.count() >= 4)
{
- for(sal_uInt32 b(0L); b < 4L; b++)
+ for(sal_uInt32 b(0); b < 4; b++)
{
basegfx::B2DPoint aPoint(aTmpPoly.getTextureCoordinate(b));
if(bObjectSpecificX)
{
- aPoint.setX((1L == b || 2L == b) ? 1.0 : 0.0);
+ aPoint.setX((1 == b || 2 == b) ? 1.0 : 0.0);
}
if(bObjectSpecificY)
{
- aPoint.setY((2L == b || 3L == b) ? 1.0 : 0.0);
+ aPoint.setY((2 == b || 3 == b) ? 1.0 : 0.0);
}
aTmpPoly.setTextureCoordinate(b, aPoint);
@@ -126,9 +126,9 @@ namespace drawinglayer
}
// build vector of PolyPolygons
- ::std::vector< basegfx::B3DPolyPolygon > a3DPolyPolygonVector;
+ std::vector< basegfx::B3DPolyPolygon > a3DPolyPolygonVector;
- for(sal_uInt32 a(0L); a < aFill.count(); a++)
+ for(sal_uInt32 a(0); a < aFill.count(); a++)
{
a3DPolyPolygonVector.push_back(basegfx::B3DPolyPolygon(aFill.getB3DPolygon(a)));
}
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index dba0f54bcbd0..4287f6dbb129 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -113,7 +113,7 @@ namespace
OSL_ENSURE(rPolA.count() == rPolB.count(), "impAddInBetweenFill: unequally sized polygons (!)");
const sal_uInt32 nPolygonCount(::std::min(rPolA.count(), rPolB.count()));
- for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+ for(sal_uInt32 a(0); a < nPolygonCount; a++)
{
const basegfx::B3DPolygon aSubA(rPolA.getB3DPolygon(a));
const basegfx::B3DPolygon aSubB(rPolB.getB3DPolygon(a));
@@ -122,7 +122,7 @@ namespace
if(nPointCount)
{
- const sal_uInt32 nEdgeCount(aSubA.isClosed() ? nPointCount : nPointCount - 1L);
+ const sal_uInt32 nEdgeCount(aSubA.isClosed() ? nPointCount : nPointCount - 1);
double fTexHorMultiplicatorA(0.0), fTexHorMultiplicatorB(0.0);
double fPolygonPosA(0.0), fPolygonPosB(0.0);
@@ -135,10 +135,10 @@ namespace
fTexHorMultiplicatorB = basegfx::fTools::equalZero(fPolygonLengthB) ? 1.0 : 1.0 / fPolygonLengthB;
}
- for(sal_uInt32 b(0L); b < nEdgeCount; b++)
+ for(sal_uInt32 b(0); b < nEdgeCount; b++)
{
const sal_uInt32 nIndexA(b);
- const sal_uInt32 nIndexB((b + 1L) % nPointCount);
+ const sal_uInt32 nIndexB((b + 1) % nPointCount);
const basegfx::B3DPoint aStartA(aSubA.getB3DPoint(nIndexA));
const basegfx::B3DPoint aEndA(aSubA.getB3DPoint(nIndexB));
@@ -189,11 +189,11 @@ namespace
basegfx::B3DPolyPolygon& rCandidate,
const basegfx::B3DVector& rNormal)
{
- for(sal_uInt32 a(0L); a < rCandidate.count(); a++)
+ for(sal_uInt32 a(0); a < rCandidate.count(); a++)
{
basegfx::B3DPolygon aSub(rCandidate.getB3DPolygon(a));
- for(sal_uInt32 b(0L); b < aSub.count(); b++)
+ for(sal_uInt32 b(0); b < aSub.count(); b++)
{
aSub.setNormal(b, rNormal);
}
@@ -210,7 +210,7 @@ namespace
OSL_ENSURE(rPolA.count() == rPolB.count(), "sdrExtrudePrimitive3D: unequally sized polygons (!)");
const sal_uInt32 nPolygonCount(::std::min(rPolA.count(), rPolB.count()));
- for(sal_uInt32 a(0L); a < nPolygonCount; a++)
+ for(sal_uInt32 a(0); a < nPolygonCount; a++)
{
basegfx::B3DPolygon aSubA(rPolA.getB3DPolygon(a));
basegfx::B3DPolygon aSubB(rPolB.getB3DPolygon(a));
@@ -219,13 +219,13 @@ namespace
if(nPointCount)
{
- basegfx::B3DPoint aPrevA(aSubA.getB3DPoint(nPointCount - 1L));
- basegfx::B3DPoint aCurrA(aSubA.getB3DPoint(0L));
+ basegfx::B3DPoint aPrevA(aSubA.getB3DPoint(nPointCount - 1));
+ basegfx::B3DPoint aCurrA(aSubA.getB3DPoint(0));
const bool bClosed(aSubA.isClosed());
for(sal_uInt32 b(0L); b < nPointCount; b++)
{
- const sal_uInt32 nIndNext((b + 1L) % nPointCount);
+ const sal_uInt32 nIndNext((b + 1) % nPointCount);
const basegfx::B3DPoint aNextA(aSubA.getB3DPoint(nIndNext));
const basegfx::B3DPoint aCurrB(aSubB.getB3DPoint(b));
@@ -242,7 +242,7 @@ namespace
}
// vector to left (correct for non-closed lines)
- const bool bFirstAndNotClosed(!bClosed && 0L == b);
+ const bool bFirstAndNotClosed(!bClosed && 0 == b);
basegfx::B3DVector aLeft(bFirstAndNotClosed ? aCurrA - aNextA : aPrevA - aCurrA);
aLeft.normalize();
@@ -252,7 +252,7 @@ namespace
if(bSmoothHorizontalNormals)
{
// vector to right (correct for non-closed lines)
- const bool bLastAndNotClosed(!bClosed && b + 1L == nPointCount);
+ const bool bLastAndNotClosed(!bClosed && b + 1 == nPointCount);
basegfx::B3DVector aRight(bLastAndNotClosed ? aCurrA - aPrevA : aNextA - aCurrA);
aRight.normalize();
@@ -361,7 +361,7 @@ namespace drawinglayer
bool bCloseFront,
bool bCloseBack)
{
- if(basegfx::fTools::equalZero(fRotation) || 0L == nSteps)
+ if(basegfx::fTools::equalZero(fRotation) || 0 == nSteps)
{
// no rotation or no steps, just one plane
rSliceVector.push_back(Slice3D(rSource, basegfx::B3DHomMatrix()));
@@ -418,7 +418,7 @@ namespace drawinglayer
}
}
- // add start polygon (a = 0L)
+ // add start polygon (a = 0)
if(!bClosedRotation)
{
rSliceVector.push_back(Slice3D(aFront, basegfx::B3DHomMatrix()));
@@ -427,9 +427,9 @@ namespace drawinglayer
// create segments (a + 1 .. nSteps)
const double fStepSize(1.0 / (double)nSteps);
- for(sal_uInt32 a(0L); a < nSteps; a++)
+ for(sal_uInt32 a(0); a < nSteps; a++)
{
- const double fStep((double)(a + 1L) * fStepSize);
+ const double fStep((double)(a + 1) * fStepSize);
basegfx::B2DPolyPolygon aNewPoly(bBackScale ? basegfx::tools::interpolate(aFront, aBack, fStep) : aFront);
basegfx::B3DHomMatrix aNewMat;
aNewMat.rotate(0.0, fRotation * fStep, 0.0);
@@ -563,7 +563,7 @@ namespace drawinglayer
basegfx::B3DPolyPolygon aRetval;
const sal_uInt32 nNumSlices(rSliceVector.size());
- for(sal_uInt32 a(0L); a < nNumSlices; a++)
+ for(sal_uInt32 a(0); a < nNumSlices; a++)
{
aRetval.append(rSliceVector[a].getB3DPolyPolygon());
}
@@ -589,7 +589,7 @@ namespace drawinglayer
if(nNumSlices)
{
// common parameters
- const sal_uInt32 nLoopCount(bClosed ? nNumSlices : nNumSlices - 1L);
+ const sal_uInt32 nLoopCount(bClosed ? nNumSlices : nNumSlices - 1);
basegfx::B3DPolyPolygon aEdgeRounding;
sal_uInt32 a;
@@ -602,7 +602,7 @@ namespace drawinglayer
if(bCreateTextureCoordinates)
{
aTexRangeFront = basegfx::tools::getRange(rSliceVector[0L].getB3DPolyPolygon());
- aTexRangeBack = basegfx::tools::getRange(rSliceVector[nNumSlices - 1L].getB3DPolyPolygon());
+ aTexRangeBack = basegfx::tools::getRange(rSliceVector[nNumSlices - 1].getB3DPolyPolygon());
if(aTexRangeBack.getDepth() > aTexRangeBack.getWidth())
{
@@ -616,9 +616,9 @@ namespace drawinglayer
basegfx::B3DPoint aCenter(basegfx::tools::getRange(rSliceVector[0L].getB3DPolyPolygon()).getCenter());
- for(a = 0L; a < nLoopCount; a++)
+ for(a = 0; a < nLoopCount; a++)
{
- const basegfx::B3DPoint aNextCenter(basegfx::tools::getRange(rSliceVector[(a + 1L) % nNumSlices].getB3DPolyPolygon()).getCenter());
+ const basegfx::B3DPoint aNextCenter(basegfx::tools::getRange(rSliceVector[(a + 1) % nNumSlices].getB3DPolyPolygon()).getCenter());
const double fLength(basegfx::B3DVector(aNextCenter - aCenter).getLength());
aTexHeightArray.push_back(fLength);
aCenter = aNextCenter;
@@ -635,10 +635,10 @@ namespace drawinglayer
if(nLoopCount)
{
double fTexHeightPos(0.0);
- for(a = 0L; a < nLoopCount; a++)
+ for(a = 0; a < nLoopCount; a++)
{
const Slice3D& rSliceA(rSliceVector[a]);
- const Slice3D& rSliceB(rSliceVector[(a + 1L) % nNumSlices]);
+ const Slice3D& rSliceB(rSliceVector[(a + 1) % nNumSlices]);
const bool bAcceptPair(SLICETYPE3D_REGULAR == rSliceA.getSliceType() && SLICETYPE3D_REGULAR == rSliceB.getSliceType());
basegfx::B3DPolyPolygon aPolA(rSliceA.getB3DPolyPolygon());
basegfx::B3DPolyPolygon aPolB(rSliceB.getB3DPolyPolygon());
@@ -651,7 +651,7 @@ namespace drawinglayer
}
{
- const sal_uInt32 nIndPrev((a + nNumSlices - 1L) % nNumSlices);
+ const sal_uInt32 nIndPrev((a + nNumSlices - 1) % nNumSlices);
const Slice3D& rSlicePrev(rSliceVector[nIndPrev]);
basegfx::B3DPolyPolygon aPrev(rSlicePrev.getB3DPolyPolygon());
basegfx::B3DPolyPolygon aPolAA(rSliceA.getB3DPolyPolygon());
@@ -672,7 +672,7 @@ namespace drawinglayer
if(aFront.count())
{
- aNormal = -aFront.getB3DPolygon(0L).getNormal();
+ aNormal = -aFront.getB3DPolygon(0).getNormal();
}
impSetNormal(aFront, aNormal);
@@ -729,7 +729,7 @@ namespace drawinglayer
if(bCreateTextureCoordinates)
{
fTexStart = fTexHeightPos * fInvTexHeight;
- fTexStop = (fTexHeightPos - aTexHeightArray[(a + nLoopCount - 1L) % nLoopCount]) * fInvTexHeight;
+ fTexStop = (fTexHeightPos - aTexHeightArray[(a + nLoopCount - 1) % nLoopCount]) * fInvTexHeight;
}
impAddInBetweenFill(aEdgeRounding, aPolAA, aPrev, fTexStart, fTexStop, bCreateNormals, bCreateTextureCoordinates);
@@ -740,7 +740,7 @@ namespace drawinglayer
}
else
{
- if(bCreateNormals && bSmoothNormals && (nIndPrev != a + 1L))
+ if(bCreateNormals && bSmoothNormals && (nIndPrev != a + 1))
{
impCreateInBetweenNormals(aPolAA, aPrev, bSmoothHorizontalNormals);
impMixNormals(aPolA, aPolAA, 0.5);
@@ -749,7 +749,7 @@ namespace drawinglayer
}
{
- const sal_uInt32 nIndNext((a + 2L) % nNumSlices);
+ const sal_uInt32 nIndNext((a + 2) % nNumSlices);
const Slice3D& rSliceNext(rSliceVector[nIndNext]);
basegfx::B3DPolyPolygon aNext(rSliceNext.getB3DPolyPolygon());
basegfx::B3DPolyPolygon aPolBB(rSliceB.getB3DPolyPolygon());
@@ -820,7 +820,7 @@ namespace drawinglayer
double fTexStop{};
if(bCreateTextureCoordinates)
{
- fTexStart = (fTexHeightPos + aTexHeightArray[a] + aTexHeightArray[(a + 1L) % nLoopCount]) * fInvTexHeight;
+ fTexStart = (fTexHeightPos + aTexHeightArray[a] + aTexHeightArray[(a + 1) % nLoopCount]) * fInvTexHeight;
fTexStop = (fTexHeightPos + aTexHeightArray[a]) * fInvTexHeight;
}
@@ -874,7 +874,7 @@ namespace drawinglayer
if(aFront.count())
{
- aNormal = -aFront.getB3DPolygon(0L).getNormal();
+ aNormal = -aFront.getB3DPolygon(0).getNormal();
}
impSetNormal(aFront, aNormal);
@@ -889,7 +889,7 @@ namespace drawinglayer
aEdgeRounding.transformTextureCoordinates(rTexTransform);
}
- for(a = 0L; a < aEdgeRounding.count(); a++)
+ for(a = 0; a < aEdgeRounding.count(); a++)
{
rFill.push_back(basegfx::B3DPolyPolygon(aEdgeRounding.getB3DPolygon(a)));
}
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index 64041d8439df..47f32c4ed1d6 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -214,7 +214,7 @@ namespace drawinglayer
// that for polyPolygons, the subPolys 1..n only get reSegmented when polygon 0L is different
// at all (and not always)
const basegfx::B2DPolygon aSubCandidate(maCorrectedPolyPolygon.getB2DPolygon(0));
- const sal_uInt32 nSubEdgeCount(aSubCandidate.isClosed() ? aSubCandidate.count() : (aSubCandidate.count() ? aSubCandidate.count() - 1L : 0L));
+ const sal_uInt32 nSubEdgeCount(aSubCandidate.isClosed() ? aSubCandidate.count() : (aSubCandidate.count() ? aSubCandidate.count() - 1 : 0L));
if(nSubEdgeCount != getVerticalSegments())
{
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index 42080eed51ca..0c51bb182adb 100644
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
@@ -87,7 +87,7 @@ namespace drawinglayer
// different from forced to sphere texture coordinates,
// create a old version from it by rotating to old state before applying
// the texture coordinates to emulate old behaviour
- fRelativeAngle = F_2PI * ((double)((getHorizontalSegments() >> 1) - 1L) / (double)getHorizontalSegments());
+ fRelativeAngle = F_2PI * ((double)((getHorizontalSegments() >> 1) - 1) / (double)getHorizontalSegments());
basegfx::B3DHomMatrix aRot;
aRot.rotate(0.0, fRelativeAngle, 0.0);
aFill.transform(aRot);
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 885367d3a78f..172b82bf00e6 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -135,7 +135,7 @@ namespace
if(aCandidate.areControlPointsUsed())
{
// compare with the maximum for bezier curved polygons
- bNeedToSplit = nPointCount > ((MAX_POLYGON_POINT_COUNT_METAFILE / 3L) - 1L);
+ bNeedToSplit = nPointCount > ((MAX_POLYGON_POINT_COUNT_METAFILE / 3L) - 1);
}
else
{
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index 50830bae4275..02a71ae25dc7 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -70,14 +70,14 @@ namespace drawinglayer
if(nMaxSteps)
{
// there IS a color distance
- if(nSteps == 0L)
+ if(nSteps == 0)
{
nSteps = nMaxSteps;
}
- if(nSteps < 2L)
+ if(nSteps < 2)
{
- nSteps = 2L;
+ nSteps = 2;
}
if(nSteps > nMaxSteps)
diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx
index 4e4d19b6dd5f..bb2553ac789f 100644
--- a/drawinglayer/source/texture/texture3d.cxx
+++ b/drawinglayer/source/texture/texture3d.cxx
@@ -161,11 +161,11 @@ namespace drawinglayer
{
rX = (sal_Int32)((rUV.getX() - maTopLeft.getX()) * mfMulX);
- if(rX >= 0L && rX < mpReadBitmap->Width())
+ if(rX >= 0 && rX < mpReadBitmap->Width())
{
rY = (sal_Int32)((rUV.getY() - maTopLeft.getY()) * mfMulY);
- return (rY >= 0L && rY < mpReadBitmap->Height());
+ return (rY >= 0 && rY < mpReadBitmap->Height());
}
}
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 0accd5a69303..8adaeff23d28 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -512,7 +512,7 @@ void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const b
{
bool bSimple(false);
- if(pLinePolyPolygon && 1L == rPolyPolygon.count())
+ if(pLinePolyPolygon && 1 == rPolyPolygon.count())
{
if(rPolyPolygon.getB2DPolygon(0L).isClosed())
{
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index 90faba32e8fc..51b3317fa94c 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -608,7 +608,7 @@ void GridWindow::MouseButtonDown( const MouseEvent& rEvt )
// user wants to add/delete a button
if( nMarkerIndex != 0xffffffff )
{
- if( nMarkerIndex != 0L && nMarkerIndex != m_aHandles.size() - 1L)
+ if( nMarkerIndex != 0 && nMarkerIndex != m_aHandles.size() - 1)
{
// delete marker under mouse
if( m_nDragIndex == nMarkerIndex )
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 4b1315fc44ff..e6762f76e6a6 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -212,7 +212,7 @@ void GIFWriter::WriteAnimation( const Animation& rAnimation )
{
const double fStep = 100. / nCount;
- nMinPercent = 0L;
+ nMinPercent = 0;
nMaxPercent = (sal_uLong) fStep;
for( sal_uInt16 i = 0; i < nCount; i++ )
@@ -509,7 +509,7 @@ void GIFWriter::WriteAccess()
aCompressor.Compress( m_pAcc->GetScanline( nY ), nWidth );
else
{
- for( long nX = 0L; nX < nWidth; nX++ )
+ for( long nX = 0; nX < nWidth; nX++ )
pBuffer[ nX ] = m_pAcc->GetPixelIndex( nY, nX );
aCompressor.Compress( pBuffer.get(), nWidth );
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index c78101ebddca..ee69d94f2ae4 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -305,7 +305,7 @@ void PCDReader::ReadImage()
}
}
// conversion of nL,nCb,nCr in nRed,nGreen,nBlue:
- nL *= 89024L;
+ nL *= 89024;
nCb -= 156;
nCr -= 137;
nRed = ( nL + nCr * 119374L + 0x8000 ) >> 16;
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list