solenv/clang-format/excludelist | 118 ---
vcl/backendtest/outputdevice/gradient.cxx | 36 -
vcl/backendtest/outputdevice/pixel.cxx | 7
vcl/backendtest/outputdevice/polypolygon.cxx | 16
vcl/backendtest/outputdevice/rectangle.cxx | 30
vcl/headless/svpcairotextrender.cxx | 10
vcl/inc/BitmapScaleConvolutionFilter.hxx | 6
vcl/inc/BitmapScaleSuperFilter.hxx | 1
vcl/inc/BitmapSymmetryCheck.hxx | 2
vcl/inc/ControlCacheKey.hxx | 13
vcl/inc/IconThemeScanner.hxx | 26
vcl/inc/android/androidinst.hxx | 14
vcl/inc/headless/svpprn.hxx | 4
vcl/inc/iconview.hxx | 5
vcl/inc/ios/iosinst.hxx | 13
vcl/inc/langboost.hxx | 2
vcl/inc/opengl/BufferObject.hxx | 8
vcl/inc/opengl/TextureState.hxx | 7
vcl/inc/opengl/x11/gdiimpl.hxx | 6
vcl/inc/opengl/zone.hxx | 12
vcl/inc/osx/a11ylistener.hxx | 11
vcl/inc/osx/keyboardfocuslistener.hxx | 5
vcl/inc/osx/salnsmenu.h | 20
vcl/inc/osx/salnstimer.h | 2
vcl/inc/quartz/ctfonts.hxx | 2
vcl/inc/regionband.hxx | 11
vcl/inc/salsys.hxx | 10
vcl/inc/scanlinewriter.hxx | 15
vcl/inc/scrptrun.h | 47 -
vcl/inc/unx/desktops.hxx | 3
vcl/inc/unx/i18n_keysym.hxx | 2
vcl/inc/unx/salunx.h | 6
vcl/inc/unx/screensaverinhibitor.hxx | 18
vcl/inc/unx/x11/x11gdiimpl.h | 4
vcl/inc/unx/x11_cursors/wshide_curs.h | 6
vcl/inc/unx/x11_cursors/wshide_mask.h | 6
vcl/inc/unx/x11_cursors/wsshow_curs.h | 6
vcl/inc/unx/x11_cursors/wsshow_mask.h | 6
vcl/inc/vcleventlisteners.hxx | 9
vcl/opengl/DeviceInfo.cxx | 4
vcl/osx/DragActionConversion.cxx | 40 -
vcl/osx/PictToBmpFlt.hxx | 9
vcl/osx/a11yactionwrapper.h | 4
vcl/osx/a11ycomponentwrapper.h | 12
vcl/osx/a11yfocuslistener.hxx | 11
vcl/osx/a11yselectionwrapper.h | 8
vcl/osx/a11ytablewrapper.h | 8
vcl/osx/a11ytextwrapper.h | 50 -
vcl/osx/a11yutil.h | 7
vcl/osx/a11yvaluewrapper.h | 12
vcl/osx/a11ywrapperbutton.h | 6
vcl/osx/a11ywrappercheckbox.h | 6
vcl/osx/a11ywrappercombobox.h | 21
vcl/osx/a11ywrappergroup.h | 4
vcl/osx/a11ywrapperlist.h | 2
vcl/osx/a11ywrapperradiobutton.h | 6
vcl/osx/a11ywrapperradiogroup.h | 2
vcl/osx/a11ywrapperrow.h | 4
vcl/osx/a11ywrapperscrollarea.h | 6
vcl/osx/a11ywrapperscrollbar.h | 2
vcl/osx/a11ywrappersplitter.h | 2
vcl/osx/a11ywrapperstatictext.h | 4
vcl/osx/a11ywrappertabgroup.h | 2
vcl/osx/a11ywrappertextarea.h | 2
vcl/osx/a11ywrappertoolbar.h | 2
vcl/qa/cppunit/BitmapProcessorTest.cxx | 1
vcl/qa/cppunit/fontcharmap.cxx | 11
vcl/qa/cppunit/jpeg/JpegReaderTest.cxx | 16
vcl/qa/cppunit/mnemonic.cxx | 6
vcl/qa/cppunit/outdev.cxx | 33 -
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 385 +++++++----
vcl/qa/unit/vcl-dialogs-test.cxx | 9
vcl/source/app/ITiledRenderable.cxx | 30
vcl/source/app/salvtables.cxx | 675 +++++++++------------
vcl/source/app/sound.cxx | 2
vcl/source/bitmap/bitmapfilter.cxx | 4
vcl/source/control/thumbpos.hxx | 5
vcl/source/filter/graphicfilter_internal.hxx | 2
vcl/source/filter/igif/gifread.hxx | 2
vcl/source/filter/ixbm/xbmread.hxx | 2
vcl/source/filter/ixpm/xpmread.hxx | 2
vcl/source/filter/jpeg/JpegTransform.hxx | 7
vcl/source/filter/jpeg/jinclude.h | 16
vcl/source/filter/png/pngwrite.cxx | 129 +---
vcl/source/filter/wmf/wmfexternal.cxx | 14
vcl/source/fontsubset/xlat.hxx | 10
vcl/source/gdi/bmpacc3.cxx | 37 -
vcl/source/gdi/extoutdevdata.cxx | 6
vcl/source/gdi/salgdiimpl.cxx | 4
vcl/source/helper/lazydelete.cxx | 16
vcl/source/helper/threadex.cxx | 18
vcl/source/salmain/salmain.cxx | 3
vcl/source/treelist/iconview.cxx | 63 -
vcl/source/treelist/iconviewimpl.hxx | 26
vcl/source/treelist/imap3.cxx | 29
vcl/source/uitest/logger.cxx | 56 -
vcl/source/window/abstdlg.cxx | 20
vcl/source/window/debug.cxx | 10
vcl/source/window/introwin.cxx | 13
vcl/source/window/window3.cxx | 9
vcl/unx/generic/gdi/nativewindowhandleprovider.cxx | 5
vcl/unx/generic/print/prtsetup.hxx | 21
vcl/unx/gtk3/a11y/atkregistry.hxx | 8
vcl/unx/gtk3/a11y/atktextattributes.hxx | 34 -
vcl/unx/gtk3/a11y/gtk3atkbridge.cxx | 4
vcl/unx/gtk3/fpicker/eventnotification.hxx | 5
vcl/win/dtrans/DtObjFactory.cxx | 5
vcl/win/dtrans/FmtFilter.hxx | 20
vcl/win/dtrans/ImplHelper.hxx | 22
vcl/win/dtrans/MimeAttrib.hxx | 8
vcl/win/dtrans/globals.hxx | 13
vcl/win/dtrans/sourcecontext.hxx | 24
vcl/win/dtrans/target.hxx | 95 +-
vcl/win/dtrans/targetdragcontext.cxx | 18
vcl/win/dtrans/targetdragcontext.hxx | 10
vcl/win/dtrans/targetdropcontext.cxx | 21
vcl/win/dtrans/targetdropcontext.hxx | 12
vcl/win/gdi/winlayout.cxx | 133 +---
vcl/workben/localestub/localestub.cxx | 10
119 files changed, 1361 insertions(+), 1539 deletions(-)
New commits:
commit 58d98a08aee7bf027c109eeb94183d24351827fa
Author: Philipp Hofer <philipp.ho...@protonmail.com>
AuthorDate: Thu Nov 12 13:26:56 2020 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Sun Nov 22 01:55:18 2020 +0100
tdf#123936 Formatting files in module vcl with clang-format
Change-Id: Ia162ad5b7499c0ddfdbfca59ae76b81335ce2d45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105728
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index fb5d403349f9..bc1764ba2cde 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14853,17 +14853,12 @@ vcl/android/androidinst.cxx
vcl/backendtest/VisualBackendTest.cxx
vcl/backendtest/outputdevice/bitmap.cxx
vcl/backendtest/outputdevice/common.cxx
-vcl/backendtest/outputdevice/gradient.cxx
vcl/backendtest/outputdevice/line.cxx
vcl/backendtest/outputdevice/outputdevice.cxx
-vcl/backendtest/outputdevice/pixel.cxx
vcl/backendtest/outputdevice/polygon.cxx
vcl/backendtest/outputdevice/polyline.cxx
-vcl/backendtest/outputdevice/polypolygon.cxx
-vcl/backendtest/outputdevice/rectangle.cxx
vcl/headless/headlessinst.cxx
vcl/headless/svpbmp.cxx
-vcl/headless/svpcairotextrender.cxx
vcl/headless/svpdata.cxx
vcl/headless/svpdummies.cxx
vcl/headless/svpframe.cxx
@@ -14872,11 +14867,6 @@ vcl/headless/svpinst.cxx
vcl/headless/svpprn.cxx
vcl/headless/svptext.cxx
vcl/headless/svpvd.cxx
-vcl/inc/BitmapScaleConvolutionFilter.hxx
-vcl/inc/BitmapScaleSuperFilter.hxx
-vcl/inc/BitmapSymmetryCheck.hxx
-vcl/inc/ControlCacheKey.hxx
-vcl/inc/IconThemeScanner.hxx
vcl/inc/IconThemeSelector.hxx
vcl/inc/PhysicalFontCollection.hxx
vcl/inc/PhysicalFontFace.hxx
@@ -14885,7 +14875,6 @@ vcl/inc/ResampleKernel.hxx
vcl/inc/WidgetThemeLibraryTypes.hxx
vcl/inc/accel.h
vcl/inc/accmgr.hxx
-vcl/inc/android/androidinst.hxx
vcl/inc/bmpfast.hxx
vcl/inc/brdwin.hxx
vcl/inc/calendar.hxx
@@ -14910,11 +14899,9 @@ vcl/inc/headless/svpdummies.hxx
vcl/inc/headless/svpframe.hxx
vcl/inc/headless/svpgdi.hxx
vcl/inc/headless/svpinst.hxx
-vcl/inc/headless/svpprn.hxx
vcl/inc/headless/svpvd.hxx
vcl/inc/helpwin.hxx
vcl/inc/hyperlabel.hxx
-vcl/inc/iconview.hxx
vcl/inc/image.h
vcl/inc/imagerepository.hxx
vcl/inc/impanmvw.hxx
@@ -14925,18 +14912,14 @@ vcl/inc/impfontcharmap.hxx
vcl/inc/impfontmetricdata.hxx
vcl/inc/impgraph.hxx
vcl/inc/implimagetree.hxx
-vcl/inc/ios/iosinst.hxx
vcl/inc/jobdata.hxx
vcl/inc/jobset.h
-vcl/inc/langboost.hxx
vcl/inc/listbox.hxx
-vcl/inc/opengl/BufferObject.hxx
vcl/inc/opengl/FixedTextureAtlas.hxx
vcl/inc/opengl/LineRenderUtils.hxx
vcl/inc/opengl/PackedTextureAtlas.hxx
vcl/inc/opengl/RenderList.hxx
vcl/inc/opengl/RenderState.hxx
-vcl/inc/opengl/TextureState.hxx
vcl/inc/opengl/VertexUtils.hxx
vcl/inc/opengl/framebuffer.hxx
vcl/inc/opengl/gdiimpl.hxx
@@ -14946,14 +14929,10 @@ vcl/inc/opengl/texture.hxx
vcl/inc/opengl/win/WinDeviceInfo.hxx
vcl/inc/opengl/win/gdiimpl.hxx
vcl/inc/opengl/x11/X11DeviceInfo.hxx
-vcl/inc/opengl/x11/gdiimpl.hxx
vcl/inc/opengl/x11/salvd.hxx
-vcl/inc/opengl/zone.hxx
vcl/inc/osx/a11yfactory.h
vcl/inc/osx/a11yfocustracker.hxx
-vcl/inc/osx/a11ylistener.hxx
vcl/inc/osx/a11ywrapper.h
-vcl/inc/osx/keyboardfocuslistener.hxx
vcl/inc/osx/printview.h
vcl/inc/osx/runinmain.hxx
vcl/inc/osx/saldata.hxx
@@ -14962,8 +14941,6 @@ vcl/inc/osx/salframeview.h
vcl/inc/osx/salinst.h
vcl/inc/osx/salmenu.h
vcl/inc/osx/salnativewidgets.h
-vcl/inc/osx/salnsmenu.h
-vcl/inc/osx/salnstimer.h
vcl/inc/osx/salobj.h
vcl/inc/osx/salprn.h
vcl/inc/osx/salsys.h
@@ -14976,14 +14953,12 @@ vcl/inc/print.h
vcl/inc/printdlg.hxx
vcl/inc/printerinfomanager.hxx
vcl/inc/quartz/common.h
-vcl/inc/quartz/ctfonts.hxx
vcl/inc/quartz/salbmp.h
vcl/inc/quartz/salgdi.h
vcl/inc/quartz/salgdicommon.hxx
vcl/inc/quartz/salvd.h
vcl/inc/quartz/utils.h
vcl/inc/regband.hxx
-vcl/inc/regionband.hxx
vcl/inc/salbmp.hxx
vcl/inc/saldatabasic.hxx
vcl/inc/salframe.hxx
@@ -14997,14 +14972,11 @@ vcl/inc/salobj.hxx
vcl/inc/salprn.hxx
vcl/inc/salptype.hxx
vcl/inc/salsession.hxx
-vcl/inc/salsys.hxx
vcl/inc/saltimer.hxx
vcl/inc/salusereventlist.hxx
vcl/inc/salvd.hxx
vcl/inc/salwtype.hxx
-vcl/inc/scanlinewriter.hxx
vcl/inc/schedulerimpl.hxx
-vcl/inc/scrptrun.h
vcl/inc/scrwnd.hxx
vcl/inc/sft.hxx
vcl/inc/slider.hxx
@@ -15021,7 +14993,6 @@ vcl/inc/toolbox.h
vcl/inc/unx/cairotextrender.hxx
vcl/inc/unx/cpdmgr.hxx
vcl/inc/unx/cupsmgr.hxx
-vcl/inc/unx/desktops.hxx
vcl/inc/unx/fc_fontoptions.hxx
vcl/inc/unx/fontmanager.hxx
vcl/inc/unx/freetype_glyphcache.hxx
@@ -15048,7 +15019,6 @@ vcl/inc/unx/helper.hxx
vcl/inc/unx/i18n_cb.hxx
vcl/inc/unx/i18n_ic.hxx
vcl/inc/unx/i18n_im.hxx
-vcl/inc/unx/i18n_keysym.hxx
vcl/inc/unx/i18n_xkb.hxx
vcl/inc/unx/printergfx.hxx
vcl/inc/unx/printerjob.hxx
@@ -15061,13 +15031,10 @@ vcl/inc/unx/salinst.h
vcl/inc/unx/salobj.h
vcl/inc/unx/saltimer.h
vcl/inc/unx/saltype.h
-vcl/inc/unx/salunx.h
vcl/inc/unx/salunxtime.h
vcl/inc/unx/salvd.h
-vcl/inc/unx/screensaverinhibitor.hxx
vcl/inc/unx/sm.hxx
vcl/inc/unx/wmadaptor.hxx
-vcl/inc/unx/x11/x11gdiimpl.h
vcl/inc/unx/x11/x11sys.hxx
vcl/inc/unx/x11/xlimits.hxx
vcl/inc/unx/x11/xrender_peer.hxx
@@ -15192,11 +15159,6 @@ vcl/inc/unx/x11_cursors/vertcurs_curs.h
vcl/inc/unx/x11_cursors/vertcurs_mask.h
vcl/inc/unx/x11_cursors/vshear_curs.h
vcl/inc/unx/x11_cursors/vshear_mask.h
-vcl/inc/unx/x11_cursors/wshide_curs.h
-vcl/inc/unx/x11_cursors/wshide_mask.h
-vcl/inc/unx/x11_cursors/wsshow_curs.h
-vcl/inc/unx/x11_cursors/wsshow_mask.h
-vcl/inc/vcleventlisteners.hxx
vcl/inc/vclstatuslistener.hxx
vcl/inc/wall2.hxx
vcl/inc/win/DWriteTextRenderer.hxx
@@ -15218,7 +15180,6 @@ vcl/inc/wizdlg.hxx
vcl/ios/dummies.cxx
vcl/ios/iosinst.cxx
vcl/null/printerinfomanager.cxx
-vcl/opengl/DeviceInfo.cxx
vcl/opengl/FixedTextureAtlas.cxx
vcl/opengl/LineRenderUtils.cxx
vcl/opengl/PackedTextureAtlas.cxx
@@ -15237,7 +15198,6 @@ vcl/opengl/x11/gdiimpl.cxx
vcl/opengl/x11/salvd.cxx
vcl/osx/DataFlavorMapping.cxx
vcl/osx/DataFlavorMapping.hxx
-vcl/osx/DragActionConversion.cxx
vcl/osx/DragSource.cxx
vcl/osx/DragSource.hxx
vcl/osx/DragSourceContext.cxx
@@ -15248,35 +15208,11 @@ vcl/osx/HtmlFmtFlt.cxx
vcl/osx/OSXTransferable.cxx
vcl/osx/OSXTransferable.hxx
vcl/osx/PictToBmpFlt.cxx
-vcl/osx/PictToBmpFlt.hxx
-vcl/osx/a11yactionwrapper.h
-vcl/osx/a11ycomponentwrapper.h
vcl/osx/a11yfocuslistener.cxx
-vcl/osx/a11yfocuslistener.hxx
vcl/osx/a11yfocustracker.cxx
vcl/osx/a11ylistener.cxx
vcl/osx/a11yrolehelper.h
-vcl/osx/a11yselectionwrapper.h
-vcl/osx/a11ytablewrapper.h
vcl/osx/a11ytextattributeswrapper.h
-vcl/osx/a11ytextwrapper.h
-vcl/osx/a11yutil.h
-vcl/osx/a11yvaluewrapper.h
-vcl/osx/a11ywrapperbutton.h
-vcl/osx/a11ywrappercheckbox.h
-vcl/osx/a11ywrappercombobox.h
-vcl/osx/a11ywrappergroup.h
-vcl/osx/a11ywrapperlist.h
-vcl/osx/a11ywrapperradiobutton.h
-vcl/osx/a11ywrapperradiogroup.h
-vcl/osx/a11ywrapperrow.h
-vcl/osx/a11ywrapperscrollarea.h
-vcl/osx/a11ywrapperscrollbar.h
-vcl/osx/a11ywrappersplitter.h
-vcl/osx/a11ywrapperstatictext.h
-vcl/osx/a11ywrappertabgroup.h
-vcl/osx/a11ywrappertextarea.h
-vcl/osx/a11ywrappertoolbar.h
vcl/osx/clipboard.cxx
vcl/osx/clipboard.hxx
vcl/osx/cuidraw.hxx
@@ -15292,7 +15228,6 @@ vcl/osx/salprn.cxx
vcl/osx/salsys.cxx
vcl/osx/saltimer.cxx
vcl/osx/service_entry.cxx
-vcl/qa/cppunit/BitmapProcessorTest.cxx
vcl/qa/cppunit/app/test_IconThemeInfo.cxx
vcl/qa/cppunit/app/test_IconThemeScanner.cxx
vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -15302,17 +15237,11 @@ vcl/qa/cppunit/complextext.cxx
vcl/qa/cppunit/dndtest.cxx
vcl/qa/cppunit/errorhandler.cxx
vcl/qa/cppunit/font.cxx
-vcl/qa/cppunit/fontcharmap.cxx
vcl/qa/cppunit/fontmetric.cxx
vcl/qa/cppunit/graphicfilter/filters-test.cxx
-vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
vcl/qa/cppunit/lifecycle.cxx
-vcl/qa/cppunit/mnemonic.cxx
-vcl/qa/cppunit/outdev.cxx
-vcl/qa/cppunit/pdfexport/pdfexport.cxx
vcl/qa/cppunit/svm/svmtest.cxx
vcl/qa/cppunit/timer.cxx
-vcl/qa/unit/vcl-dialogs-test.cxx
vcl/quartz/ctfonts.cxx
vcl/quartz/salbmp.cxx
vcl/quartz/salgdi.cxx
@@ -15320,7 +15249,6 @@ vcl/quartz/salgdicommon.cxx
vcl/quartz/salgdiutils.cxx
vcl/quartz/salvd.cxx
vcl/quartz/utils.cxx
-vcl/source/app/ITiledRenderable.cxx
vcl/source/app/IconThemeInfo.cxx
vcl/source/app/IconThemeScanner.cxx
vcl/source/app/IconThemeSelector.cxx
@@ -15332,11 +15260,9 @@ vcl/source/app/i18nhelp.cxx
vcl/source/app/idle.cxx
vcl/source/app/salplug.cxx
vcl/source/app/salusereventlist.cxx
-vcl/source/app/salvtables.cxx
vcl/source/app/scheduler.cxx
vcl/source/app/session.cxx
vcl/source/app/settings.cxx
-vcl/source/app/sound.cxx
vcl/source/app/stdtext.cxx
vcl/source/app/svapp.cxx
vcl/source/app/svdata.cxx
@@ -15350,7 +15276,6 @@ vcl/source/bitmap/BitmapScaleSuperFilter.cxx
vcl/source/bitmap/BitmapSymmetryCheck.cxx
vcl/source/bitmap/BitmapTools.cxx
vcl/source/bitmap/bitmap.cxx
-vcl/source/bitmap/bitmapfilter.cxx
vcl/source/bitmap/checksum.cxx
vcl/source/bitmap/salbmp.cxx
vcl/source/cnttype/mcnttfactory.cxx
@@ -15391,7 +15316,6 @@ vcl/source/control/spinbtn.cxx
vcl/source/control/spinfld.cxx
vcl/source/control/tabctrl.cxx
vcl/source/control/throbber.cxx
-vcl/source/control/thumbpos.hxx
vcl/source/control/wizardmachine.cxx
vcl/source/control/wizimpldata.hxx
vcl/source/edit/textdat2.hxx
@@ -15411,25 +15335,19 @@ vcl/source/filter/FilterConfigCache.hxx
vcl/source/filter/FilterConfigItem.cxx
vcl/source/filter/graphicfilter.cxx
vcl/source/filter/graphicfilter2.cxx
-vcl/source/filter/graphicfilter_internal.hxx
vcl/source/filter/igif/decode.cxx
vcl/source/filter/igif/decode.hxx
vcl/source/filter/igif/gifread.cxx
-vcl/source/filter/igif/gifread.hxx
vcl/source/filter/ixbm/xbmread.cxx
-vcl/source/filter/ixbm/xbmread.hxx
vcl/source/filter/ixpm/rgbtable.hxx
vcl/source/filter/ixpm/xpmread.cxx
-vcl/source/filter/ixpm/xpmread.hxx
vcl/source/filter/jpeg/Exif.cxx
vcl/source/filter/jpeg/Exif.hxx
vcl/source/filter/jpeg/JpegReader.cxx
vcl/source/filter/jpeg/JpegReader.hxx
vcl/source/filter/jpeg/JpegTransform.cxx
-vcl/source/filter/jpeg/JpegTransform.hxx
vcl/source/filter/jpeg/JpegWriter.cxx
vcl/source/filter/jpeg/JpegWriter.hxx
-vcl/source/filter/jpeg/jinclude.h
vcl/source/filter/jpeg/jpeg.cxx
vcl/source/filter/jpeg/jpeg.h
vcl/source/filter/jpeg/jpeg.hxx
@@ -15437,11 +15355,9 @@ vcl/source/filter/jpeg/jpegc.cxx
vcl/source/filter/jpeg/transupp.c
vcl/source/filter/jpeg/transupp.h
vcl/source/filter/png/pngread.cxx
-vcl/source/filter/png/pngwrite.cxx
vcl/source/filter/wmf/emfwr.cxx
vcl/source/filter/wmf/emfwr.hxx
vcl/source/filter/wmf/wmf.cxx
-vcl/source/filter/wmf/wmfexternal.cxx
vcl/source/filter/wmf/wmfwr.cxx
vcl/source/filter/wmf/wmfwr.hxx
vcl/source/font/PhysicalFontCollection.cxx
@@ -15462,7 +15378,6 @@ vcl/source/fontsubset/sft.cxx
vcl/source/fontsubset/ttcr.cxx
vcl/source/fontsubset/ttcr.hxx
vcl/source/fontsubset/xlat.cxx
-vcl/source/fontsubset/xlat.hxx
vcl/source/gdi/CommonSalLayout.cxx
vcl/source/gdi/VerticalOrientationData.cxx
vcl/source/gdi/alpha.cxx
@@ -15470,13 +15385,11 @@ vcl/source/gdi/bitmap3.cxx
vcl/source/gdi/bitmapex.cxx
vcl/source/gdi/bmpacc.cxx
vcl/source/gdi/bmpacc2.cxx
-vcl/source/gdi/bmpacc3.cxx
vcl/source/gdi/bmpfast.cxx
vcl/source/gdi/configsettings.cxx
vcl/source/gdi/cvtgrf.cxx
vcl/source/gdi/dibtools.cxx
vcl/source/gdi/embeddedfontshelper.cxx
-vcl/source/gdi/extoutdevdata.cxx
vcl/source/gdi/gdimetafiletools.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/gdi/gfxlink.cxx
@@ -15507,7 +15420,6 @@ vcl/source/gdi/print3.cxx
vcl/source/gdi/regband.cxx
vcl/source/gdi/region.cxx
vcl/source/gdi/regionband.cxx
-vcl/source/gdi/salgdiimpl.cxx
vcl/source/gdi/salgdilayout.cxx
vcl/source/gdi/sallayout.cxx
vcl/source/gdi/salmisc.cxx
@@ -15530,10 +15442,8 @@ vcl/source/helper/canvastools.cxx
vcl/source/helper/commandinfoprovider.cxx
vcl/source/helper/displayconnectiondispatch.cxx
vcl/source/helper/evntpost.cxx
-vcl/source/helper/lazydelete.cxx
vcl/source/helper/strhelper.cxx
vcl/source/helper/svtaccessiblefactory.cxx
-vcl/source/helper/threadex.cxx
vcl/source/image/Image.cxx
vcl/source/image/ImageRepository.cxx
vcl/source/image/ImageTree.cxx
@@ -15562,16 +15472,12 @@ vcl/source/outdev/textline.cxx
vcl/source/outdev/transparent.cxx
vcl/source/outdev/vclreferencebase.cxx
vcl/source/outdev/wallpaper.cxx
-vcl/source/salmain/salmain.cxx
vcl/source/toolkit/group.cxx
vcl/source/toolkit/morebtn.cxx
vcl/source/treelist/headbar.cxx
-vcl/source/treelist/iconview.cxx
vcl/source/treelist/iconviewimpl.cxx
-vcl/source/treelist/iconviewimpl.hxx
vcl/source/treelist/imap.cxx
vcl/source/treelist/imap2.cxx
-vcl/source/treelist/imap3.cxx
vcl/source/treelist/inetimg.cxx
vcl/source/treelist/svimpbox.cxx
vcl/source/treelist/svlbitm.cxx
@@ -15584,14 +15490,12 @@ vcl/source/treelist/treelistentry.cxx
vcl/source/treelist/uiobject.cxx
vcl/source/treelist/viewdataentry.cxx
vcl/source/uipreviewer/previewer.cxx
-vcl/source/uitest/logger.cxx
vcl/source/uitest/uiobject.cxx
vcl/source/uitest/uitest.cxx
vcl/source/uitest/uno/uiobject_uno.cxx
vcl/source/uitest/uno/uiobject_uno.hxx
vcl/source/uitest/uno/uitest_uno.cxx
vcl/source/window/EnumContext.cxx
-vcl/source/window/abstdlg.cxx
vcl/source/window/accel.cxx
vcl/source/window/accessibility.cxx
vcl/source/window/accmgr.cxx
@@ -15600,7 +15504,6 @@ vcl/source/window/builder.cxx
vcl/source/window/clipping.cxx
vcl/source/window/commandevent.cxx
vcl/source/window/cursor.cxx
-vcl/source/window/debug.cxx
vcl/source/window/debugevent.cxx
vcl/source/window/decoview.cxx
vcl/source/window/dialog.cxx
@@ -15615,7 +15518,6 @@ vcl/source/window/errinf.cxx
vcl/source/window/event.cxx
vcl/source/window/floatwin.cxx
vcl/source/window/globalization.cxx
-vcl/source/window/introwin.cxx
vcl/source/window/keycod.cxx
vcl/source/window/keyevent.cxx
vcl/source/window/layout.cxx
@@ -15649,7 +15551,6 @@ vcl/source/window/toolbox.cxx
vcl/source/window/toolbox2.cxx
vcl/source/window/window.cxx
vcl/source/window/window2.cxx
-vcl/source/window/window3.cxx
vcl/source/window/winproc.cxx
vcl/source/window/wrkwin.cxx
vcl/unx/generic/app/gendisp.cxx
@@ -15701,7 +15602,6 @@ vcl/unx/generic/gdi/font.cxx
vcl/unx/generic/gdi/freetypetextrender.cxx
vcl/unx/generic/gdi/gdiimpl.cxx
vcl/unx/generic/gdi/gdiimpl.hxx
-vcl/unx/generic/gdi/nativewindowhandleprovider.cxx
vcl/unx/generic/gdi/salbmp.cxx
vcl/unx/generic/gdi/salgdi.cxx
vcl/unx/generic/gdi/salgdi2.cxx
@@ -15718,7 +15618,6 @@ vcl/unx/generic/print/glyphset.cxx
vcl/unx/generic/print/glyphset.hxx
vcl/unx/generic/print/printerjob.cxx
vcl/unx/generic/print/prtsetup.cxx
-vcl/unx/generic/print/prtsetup.hxx
vcl/unx/generic/print/psputil.cxx
vcl/unx/generic/print/psputil.hxx
vcl/unx/generic/print/text_gfx.cxx
@@ -15732,11 +15631,8 @@ vcl/unx/generic/window/salobj.cxx
vcl/unx/generic/window/screensaverinhibitor.cxx
vcl/unx/glxtest.cxx
vcl/unx/gtk3/a11y/atklistener.hxx
-vcl/unx/gtk3/a11y/atkregistry.hxx
-vcl/unx/gtk3/a11y/atktextattributes.hxx
vcl/unx/gtk3/a11y/atkwrapper.hxx
vcl/unx/gtk3/a11y/gtk3atkaction.cxx
-vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
@@ -15759,7 +15655,6 @@ vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
vcl/unx/gtk3/fpicker/SalGtkFolderPicker.hxx
vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
vcl/unx/gtk3/fpicker/SalGtkPicker.hxx
-vcl/unx/gtk3/fpicker/eventnotification.hxx
vcl/unx/gtk3/fpicker/resourceprovider.cxx
vcl/unx/gtk3/gtk3gloactiongroup.cxx
vcl/unx/gtk3/gtk3glomenu.cxx
@@ -15788,7 +15683,6 @@ vcl/win/dtrans/DataFmtTransl.cxx
vcl/win/dtrans/DataFmtTransl.hxx
vcl/win/dtrans/DOTransferable.cxx
vcl/win/dtrans/DOTransferable.hxx
-vcl/win/dtrans/DtObjFactory.cxx
vcl/win/dtrans/DtObjFactory.hxx
vcl/win/dtrans/DTransHelper.cxx
vcl/win/dtrans/DTransHelper.hxx
@@ -15797,30 +15691,20 @@ vcl/win/dtrans/Fetc.hxx
vcl/win/dtrans/FetcList.cxx
vcl/win/dtrans/FetcList.hxx
vcl/win/dtrans/FmtFilter.cxx
-vcl/win/dtrans/FmtFilter.hxx
vcl/win/dtrans/ftransl.cxx
vcl/win/dtrans/ftransl.hxx
vcl/win/dtrans/generic_clipboard.cxx
vcl/win/dtrans/generic_clipboard.hxx
vcl/win/dtrans/globals.cxx
-vcl/win/dtrans/globals.hxx
vcl/win/dtrans/idroptarget.cxx
vcl/win/dtrans/idroptarget.hxx
vcl/win/dtrans/ImplHelper.cxx
-vcl/win/dtrans/ImplHelper.hxx
-vcl/win/dtrans/MimeAttrib.hxx
vcl/win/dtrans/MtaOleClipb.cxx
vcl/win/dtrans/MtaOleClipb.hxx
vcl/win/dtrans/sourcecontext.cxx
-vcl/win/dtrans/sourcecontext.hxx
vcl/win/dtrans/source.cxx
vcl/win/dtrans/source.hxx
vcl/win/dtrans/target.cxx
-vcl/win/dtrans/targetdragcontext.cxx
-vcl/win/dtrans/targetdragcontext.hxx
-vcl/win/dtrans/targetdropcontext.cxx
-vcl/win/dtrans/targetdropcontext.hxx
-vcl/win/dtrans/target.hxx
vcl/win/dtrans/TxtCnvtHlp.cxx
vcl/win/dtrans/TxtCnvtHlp.hxx
vcl/win/dtrans/XNotifyingDataObject.cxx
@@ -15838,7 +15722,6 @@ vcl/win/gdi/salgdi_gdiplus.cxx
vcl/win/gdi/salnativewidgets-luna.cxx
vcl/win/gdi/salprn.cxx
vcl/win/gdi/salvd.cxx
-vcl/win/gdi/winlayout.cxx
vcl/win/window/keynames.cxx
vcl/win/window/salframe.cxx
vcl/win/window/salmenu.cxx
@@ -15879,7 +15762,6 @@ vcl/workben/localestub/localedata_en_TT.cxx
vcl/workben/localestub/localedata_en_US.cxx
vcl/workben/localestub/localedata_en_ZA.cxx
vcl/workben/localestub/localedata_en_ZW.cxx
-vcl/workben/localestub/localestub.cxx
vcl/workben/lwpfuzzer.cxx
vcl/workben/metfuzzer.cxx
vcl/workben/mtfdemo.cxx
diff --git a/vcl/backendtest/outputdevice/gradient.cxx
b/vcl/backendtest/outputdevice/gradient.cxx
index e9b454660cbc..ec5e9079e028 100644
--- a/vcl/backendtest/outputdevice/gradient.cxx
+++ b/vcl/backendtest/outputdevice/gradient.cxx
@@ -11,16 +11,16 @@
#include <test/outputdevice.hxx>
#include <vcl/gradient.hxx>
-namespace vcl::test {
-
+namespace vcl::test
+{
Bitmap OutputDeviceTestGradient::setupLinearGradient()
{
initialSetup(12, 12, constBackgroundColor);
Gradient aGradient(GradientStyle::Linear, Color(0xFF, 0xFF, 0xFF),
Color(0x00, 0x00, 0x00));
aGradient.SetAngle(Degree10(900));
- tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top()
+ 1,
- maVDRectangle.Right() - 1, maVDRectangle.Bottom() - 1);
+ tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top() +
1,
+ maVDRectangle.Right() - 1,
maVDRectangle.Bottom() - 1);
mpVirtualDevice->DrawGradient(aDrawRect, aGradient);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(),
maVDRectangle.GetSize());
@@ -32,8 +32,8 @@ Bitmap OutputDeviceTestGradient::setupLinearGradientAngled()
Gradient aGradient(GradientStyle::Linear, Color(0xFF, 0xFF, 0xFF),
Color(0x00, 0x00, 0x00));
aGradient.SetAngle(Degree10(450));
- tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top()
+ 1,
- maVDRectangle.Right() - 1, maVDRectangle.Bottom() - 1);
+ tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top() +
1,
+ maVDRectangle.Right() - 1,
maVDRectangle.Bottom() - 1);
mpVirtualDevice->DrawGradient(aDrawRect, aGradient);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(),
maVDRectangle.GetSize());
@@ -45,8 +45,8 @@ Bitmap OutputDeviceTestGradient::setupLinearGradientBorder()
Gradient aGradient(GradientStyle::Linear, Color(0xFF, 0xFF, 0xFF),
Color(0x00, 0x00, 0x00));
aGradient.SetBorder(50);
- tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top()
+ 1,
- maVDRectangle.Right() - 1, maVDRectangle.Bottom() - 1);
+ tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top() +
1,
+ maVDRectangle.Right() - 1,
maVDRectangle.Bottom() - 1);
mpVirtualDevice->DrawGradient(aDrawRect, aGradient);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(),
maVDRectangle.GetSize());
@@ -58,8 +58,8 @@ Bitmap
OutputDeviceTestGradient::setupLinearGradientIntensity()
Gradient aGradient(GradientStyle::Linear, Color(0xFF, 0xFF, 0xFF),
Color(0x00, 0x00, 0x00));
aGradient.SetStartIntensity(50);
- tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top()
+ 1,
- maVDRectangle.Right() - 1, maVDRectangle.Bottom() - 1);
+ tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top() +
1,
+ maVDRectangle.Right() - 1,
maVDRectangle.Bottom() - 1);
mpVirtualDevice->DrawGradient(aDrawRect, aGradient);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(),
maVDRectangle.GetSize());
@@ -72,8 +72,8 @@ Bitmap OutputDeviceTestGradient::setupLinearGradientSteps()
Gradient aGradient(GradientStyle::Linear, Color(0xFF, 0xFF, 0xFF),
Color(0x00, 0x00, 0x00));
aGradient.SetAngle(Degree10(900));
aGradient.SetSteps(4);
- tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top()
+ 1,
- maVDRectangle.Right() - 1, maVDRectangle.Bottom() - 1);
+ tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top() +
1,
+ maVDRectangle.Right() - 1,
maVDRectangle.Bottom() - 1);
mpVirtualDevice->DrawGradient(aDrawRect, aGradient);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(),
maVDRectangle.GetSize());
@@ -85,8 +85,8 @@ Bitmap OutputDeviceTestGradient::setupAxialGradient()
Gradient aGradient(GradientStyle::Axial, Color(0xFF, 0xFF, 0xFF),
Color(0x00, 0x00, 0x00));
aGradient.SetAngle(Degree10(900));
- tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top()
+ 1,
- maVDRectangle.Right() - 1, maVDRectangle.Bottom() - 1);
+ tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top() +
1,
+ maVDRectangle.Right() - 1,
maVDRectangle.Bottom() - 1);
mpVirtualDevice->DrawGradient(aDrawRect, aGradient);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(),
maVDRectangle.GetSize());
@@ -97,8 +97,8 @@ Bitmap OutputDeviceTestGradient::setupRadialGradient()
initialSetup(12, 12, constBackgroundColor);
Gradient aGradient(GradientStyle::Radial, Color(0xFF, 0xFF, 0xFF),
Color(0x00, 0x00, 0x00));
- tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top()
+ 1,
- maVDRectangle.Right() - 1, maVDRectangle.Bottom() - 1);
+ tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top() +
1,
+ maVDRectangle.Right() - 1,
maVDRectangle.Bottom() - 1);
mpVirtualDevice->DrawGradient(aDrawRect, aGradient);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(),
maVDRectangle.GetSize());
@@ -111,8 +111,8 @@ Bitmap OutputDeviceTestGradient::setupRadialGradientOfs()
Gradient aGradient(GradientStyle::Radial, Color(0xFF, 0xFF, 0xFF),
Color(0x00, 0x00, 0x00));
aGradient.SetOfsX(100); // Move center to the bottom-right corner.
aGradient.SetOfsY(100);
- tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top()
+ 1,
- maVDRectangle.Right() - 1, maVDRectangle.Bottom() - 1);
+ tools::Rectangle aDrawRect(maVDRectangle.Left() + 1, maVDRectangle.Top() +
1,
+ maVDRectangle.Right() - 1,
maVDRectangle.Bottom() - 1);
mpVirtualDevice->DrawGradient(aDrawRect, aGradient);
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(),
maVDRectangle.GetSize());
diff --git a/vcl/backendtest/outputdevice/pixel.cxx
b/vcl/backendtest/outputdevice/pixel.cxx
index 520cf50fe92f..c0fcc47705f5 100644
--- a/vcl/backendtest/outputdevice/pixel.cxx
+++ b/vcl/backendtest/outputdevice/pixel.cxx
@@ -10,12 +10,11 @@
#include <test/outputdevice.hxx>
-namespace vcl::test {
-
+namespace vcl::test
+{
namespace
{
-
-void drawPixelOffset(OutputDevice& rDevice, tools::Rectangle const & rRect,
int nOffset)
+void drawPixelOffset(OutputDevice& rDevice, tools::Rectangle const& rRect, int
nOffset)
{
for (tools::Long x = 0 + nOffset; x < (rRect.GetWidth() - nOffset); ++x)
{
diff --git a/vcl/backendtest/outputdevice/polypolygon.cxx
b/vcl/backendtest/outputdevice/polypolygon.cxx
index a53acbaf72be..9151bd28ff3f 100644
--- a/vcl/backendtest/outputdevice/polypolygon.cxx
+++ b/vcl/backendtest/outputdevice/polypolygon.cxx
@@ -10,23 +10,21 @@
#include <test/outputdevice.hxx>
-
-namespace vcl::test {
-
+namespace vcl::test
+{
namespace
{
-
-tools::Polygon createPolygonOffset(tools::Rectangle const & rRect, int
nOffset, int nFix = 0)
+tools::Polygon createPolygonOffset(tools::Rectangle const& rRect, int nOffset,
int nFix = 0)
{
// Note: According to
https://lists.freedesktop.org/archives/libreoffice/2019-November/083709.html
// filling polygons always skips the right-most and bottom-most pixels, in
order to avoid
// overlaps when drawing adjacent polygons. Specifying nFix = 1 allows to
visually compensate
// for this by making the polygon explicitly larger.
tools::Polygon aPolygon(4);
- aPolygon.SetPoint(Point(rRect.Left() + nOffset, rRect.Top() +
nOffset), 0);
- aPolygon.SetPoint(Point(rRect.Right() - nOffset + nFix, rRect.Top() +
nOffset), 1);
+ aPolygon.SetPoint(Point(rRect.Left() + nOffset, rRect.Top() + nOffset), 0);
+ aPolygon.SetPoint(Point(rRect.Right() - nOffset + nFix, rRect.Top() +
nOffset), 1);
aPolygon.SetPoint(Point(rRect.Right() - nOffset + nFix, rRect.Bottom() -
nOffset + nFix), 2);
- aPolygon.SetPoint(Point(rRect.Left() + nOffset, rRect.Bottom() - nOffset
+ nFix), 3);
+ aPolygon.SetPoint(Point(rRect.Left() + nOffset, rRect.Bottom() - nOffset +
nFix), 3);
aPolygon.Optimize(PolyOptimizeFlags::CLOSE);
return aPolygon;
}
@@ -53,7 +51,7 @@ Bitmap OutputDeviceTestPolyPolygon::setupFilledRectangle(bool
useLineColor)
{
initialSetup(13, 13, constBackgroundColor);
- if(useLineColor)
+ if (useLineColor)
mpVirtualDevice->SetLineColor(constLineColor);
else
mpVirtualDevice->SetLineColor();
diff --git a/vcl/backendtest/outputdevice/rectangle.cxx
b/vcl/backendtest/outputdevice/rectangle.cxx
index 8e7c0ba861aa..1401a39e1695 100644
--- a/vcl/backendtest/outputdevice/rectangle.cxx
+++ b/vcl/backendtest/outputdevice/rectangle.cxx
@@ -10,23 +10,23 @@
#include <test/outputdevice.hxx>
-namespace vcl::test {
-
+namespace vcl::test
+{
namespace
{
- void drawRectOffset(OutputDevice& rDevice, tools::Rectangle const & rRect,
int nOffset)
- {
- rDevice.DrawRect(tools::Rectangle(rRect.Left() + nOffset, rRect.Top()
+ nOffset,
- rRect.Right() - nOffset, rRect.Bottom() -
nOffset));
-
- }
+void drawRectOffset(OutputDevice& rDevice, tools::Rectangle const& rRect, int
nOffset)
+{
+ rDevice.DrawRect(tools::Rectangle(rRect.Left() + nOffset, rRect.Top() +
nOffset,
+ rRect.Right() - nOffset, rRect.Bottom()
- nOffset));
+}
- void drawInvertOffset(OutputDevice& rDevice, tools::Rectangle const &
rRect, int nOffset, InvertFlags eFlags)
- {
- tools::Rectangle aRectangle(rRect.Left() + nOffset, rRect.Top() +
nOffset,
- rRect.Right() - nOffset, rRect.Bottom() -
nOffset);
- rDevice.Invert(aRectangle, eFlags);
- }
+void drawInvertOffset(OutputDevice& rDevice, tools::Rectangle const& rRect,
int nOffset,
+ InvertFlags eFlags)
+{
+ tools::Rectangle aRectangle(rRect.Left() + nOffset, rRect.Top() + nOffset,
+ rRect.Right() - nOffset, rRect.Bottom() -
nOffset);
+ rDevice.Invert(aRectangle, eFlags);
+}
} // end anonymous namespace
@@ -34,7 +34,7 @@ Bitmap OutputDeviceTestRect::setupFilledRectangle(bool
useLineColor)
{
initialSetup(13, 13, constBackgroundColor);
- if(useLineColor)
+ if (useLineColor)
mpVirtualDevice->SetLineColor(constLineColor);
else
mpVirtualDevice->SetLineColor();
diff --git a/vcl/headless/svpcairotextrender.cxx
b/vcl/headless/svpcairotextrender.cxx
index de62b9e5064c..9abd5902864d 100644
--- a/vcl/headless/svpcairotextrender.cxx
+++ b/vcl/headless/svpcairotextrender.cxx
@@ -16,10 +16,7 @@ SvpCairoTextRender::SvpCairoTextRender(SvpSalGraphics&
rParent)
{
}
-cairo_t* SvpCairoTextRender::getCairoContext()
-{
- return mrParent.getCairoContext(false);
-}
+cairo_t* SvpCairoTextRender::getCairoContext() { return
mrParent.getCairoContext(false); }
void SvpCairoTextRender::getSurfaceOffset(double& nDX, double& nDY)
{
@@ -27,10 +24,7 @@ void SvpCairoTextRender::getSurfaceOffset(double& nDX,
double& nDY)
nDY = 0;
}
-void SvpCairoTextRender::clipRegion(cairo_t* cr)
-{
- mrParent.clipRegion(cr);
-}
+void SvpCairoTextRender::clipRegion(cairo_t* cr) { mrParent.clipRegion(cr); }
void SvpCairoTextRender::releaseCairoContext(cairo_t* cr)
{
diff --git a/vcl/inc/BitmapScaleConvolutionFilter.hxx
b/vcl/inc/BitmapScaleConvolutionFilter.hxx
index 9bc1bd45ca0c..fba393223382 100644
--- a/vcl/inc/BitmapScaleConvolutionFilter.hxx
+++ b/vcl/inc/BitmapScaleConvolutionFilter.hxx
@@ -29,7 +29,8 @@ namespace vcl
class BitmapScaleConvolutionFilter : public BitmapFilter
{
protected:
- BitmapScaleConvolutionFilter(const double& rScaleX, const double& rScaleY,
std::unique_ptr<Kernel> pKernel)
+ BitmapScaleConvolutionFilter(const double& rScaleX, const double& rScaleY,
+ std::unique_ptr<Kernel> pKernel)
: mxKernel(std::move(pKernel))
, mrScaleX(rScaleX)
, mrScaleY(rScaleY)
@@ -57,7 +58,7 @@ class VCL_DLLPUBLIC BitmapScaleBicubicFilter final : public
BitmapScaleConvoluti
{
public:
BitmapScaleBicubicFilter(const double& rScaleX, const double& rScaleY)
- : BitmapScaleConvolutionFilter(rScaleX, rScaleY,
std::make_unique<BicubicKernel>())
+ : BitmapScaleConvolutionFilter(rScaleX, rScaleY,
std::make_unique<BicubicKernel>())
{
}
};
@@ -70,7 +71,6 @@ public:
{
}
};
-
}
#endif // VCL_INC_BITMAPSCALECONVOLUTIONFILTER_HXX
diff --git a/vcl/inc/BitmapScaleSuperFilter.hxx
b/vcl/inc/BitmapScaleSuperFilter.hxx
index 47e48eb1ad27..764ef567840d 100644
--- a/vcl/inc/BitmapScaleSuperFilter.hxx
+++ b/vcl/inc/BitmapScaleSuperFilter.hxx
@@ -33,7 +33,6 @@ public:
private:
double mrScaleX;
double mrScaleY;
-
};
#endif
diff --git a/vcl/inc/BitmapSymmetryCheck.hxx b/vcl/inc/BitmapSymmetryCheck.hxx
index faf058923fdf..0c7d4444c774 100644
--- a/vcl/inc/BitmapSymmetryCheck.hxx
+++ b/vcl/inc/BitmapSymmetryCheck.hxx
@@ -23,7 +23,7 @@ public:
static bool check(Bitmap& rBitmap);
private:
- static bool checkImpl(BitmapReadAccess const * pReadAccess);
+ static bool checkImpl(BitmapReadAccess const* pReadAccess);
};
#endif // INCLUDED_VCL_INC_BITMAPSYMMETRYCHECK_HXX
diff --git a/vcl/inc/ControlCacheKey.hxx b/vcl/inc/ControlCacheKey.hxx
index 9c8f467ee5d4..e4e7616e2322 100644
--- a/vcl/inc/ControlCacheKey.hxx
+++ b/vcl/inc/ControlCacheKey.hxx
@@ -37,20 +37,19 @@ public:
, mnPart(nPart)
, mnState(nState)
, maSize(rSize)
- {}
+ {
+ }
bool operator==(ControlCacheKey const& aOther) const
{
- return mnType == aOther.mnType
- && mnPart == aOther.mnPart
- && mnState == aOther.mnState
- && maSize.Width() == aOther.maSize.Width()
- && maSize.Height() == aOther.maSize.Height();
+ return mnType == aOther.mnType && mnPart == aOther.mnPart && mnState
== aOther.mnState
+ && maSize.Width() == aOther.maSize.Width()
+ && maSize.Height() == aOther.maSize.Height();
}
bool canCacheControl() const
{
- switch(mnType)
+ switch (mnType)
{
case ControlType::Checkbox:
case ControlType::Radiobutton:
diff --git a/vcl/inc/IconThemeScanner.hxx b/vcl/inc/IconThemeScanner.hxx
index 3cbca74a4683..d997443a63aa 100644
--- a/vcl/inc/IconThemeScanner.hxx
+++ b/vcl/inc/IconThemeScanner.hxx
@@ -21,8 +21,8 @@
// forward declaration of unit test class. Required for friend relationship.
class IconThemeScannerTest;
-namespace vcl {
-
+namespace vcl
+{
/** This class scans a folder for icon themes and provides the results.
*/
class VCL_DLLPUBLIC IconThemeScanner
@@ -31,15 +31,13 @@ public:
/** Factory method to create the object.
* Provide a path to search for IconThemes.
*/
- static std::shared_ptr<IconThemeScanner> Create(const OUString &path);
+ static std::shared_ptr<IconThemeScanner> Create(const OUString& path);
/** This method will return the standard path where icon themes are
located.
*/
- static OUString
- GetStandardIconThemePath();
+ static OUString GetStandardIconThemePath();
- const std::vector<IconThemeInfo>&
- GetFoundIconThemes() const {return mFoundIconThemes;}
+ const std::vector<IconThemeInfo>& GetFoundIconThemes() const { return
mFoundIconThemes; }
/** Get the IconThemeInfo for a theme.
* If the theme id is not among the found themes, a std::runtime_error
will be thrown.
@@ -50,8 +48,7 @@ public:
/** Checks whether the theme with the provided name has been found in the
* scanned directory.
*/
- bool
- IconThemeIsInstalled(const OUString& themeId) const;
+ bool IconThemeIsInstalled(const OUString& themeId) const;
private:
IconThemeScanner();
@@ -63,22 +60,19 @@ private:
* - The directory does not exist
* - There are no files which match the pattern images_xxx.zip
*/
- void ScanDirectoryForIconThemes(const OUString &path);
+ void ScanDirectoryForIconThemes(const OUString& path);
/** Adds the provided icon theme by path.
*/
- bool
- AddIconThemeByPath(const OUString &path);
+ bool AddIconThemeByPath(const OUString& path);
/** Scans the provided directory for icon themes.
* The returned strings will contain the URLs to the icon themes.
*/
- static std::vector<OUString>
- ReadIconThemesFromPath(const OUString& dir);
+ static std::vector<OUString> ReadIconThemesFromPath(const OUString& dir);
/** Check whether a single file is valid */
- static bool
- FileIsValidIconTheme(const OUString&);
+ static bool FileIsValidIconTheme(const OUString&);
std::vector<IconThemeInfo> mFoundIconThemes;
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index 526174b14951..46adea903e09 100644
--- a/vcl/inc/android/androidinst.hxx
+++ b/vcl/inc/android/androidinst.hxx
@@ -22,22 +22,22 @@ class AndroidSalInstance : public SvpSalInstance
// This JNIEnv is valid only in the thread where this
// AndroidSalInstance object is created, which is the "LO" thread
// in which soffice_main() runs
- JNIEnv *m_pJNIEnv;
+ JNIEnv* m_pJNIEnv;
public:
- AndroidSalInstance( std::unique_ptr<SalYieldMutex> pMutex );
+ AndroidSalInstance(std::unique_ptr<SalYieldMutex> pMutex);
virtual ~AndroidSalInstance();
- static AndroidSalInstance *getInstance();
+ static AndroidSalInstance* getInstance();
virtual SalSystem* CreateSalSystem();
// frame management
- void GetWorkArea( tools::Rectangle& rRect );
- SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle );
- SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags
nStyle );
+ void GetWorkArea(tools::Rectangle& rRect);
+ SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle);
+ SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags
nStyle);
// mainloop pieces
- virtual bool AnyInput( VclInputFlags nType );
+ virtual bool AnyInput(VclInputFlags nType);
virtual void updateMainThread();
virtual void releaseMainThread();
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index 3d241a96eb9a..e1dd1e15f9e2 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -25,13 +25,13 @@
class SvpSalInfoPrinter final : public PspSalInfoPrinter
{
public:
- virtual bool Setup( weld::Window* pFrame, ImplJobSetup* pSetupData )
override;
+ virtual bool Setup(weld::Window* pFrame, ImplJobSetup* pSetupData)
override;
};
class SvpSalPrinter final : public PspSalPrinter
{
public:
- SvpSalPrinter( SalInfoPrinter* pInfoPrinter );
+ SvpSalPrinter(SalInfoPrinter* pInfoPrinter);
};
#endif // INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
diff --git a/vcl/inc/iconview.hxx b/vcl/inc/iconview.hxx
index 091f08fb2d3b..9c74d29f9834 100644
--- a/vcl/inc/iconview.hxx
+++ b/vcl/inc/iconview.hxx
@@ -25,13 +25,14 @@
class IconView final : public SvTreeListBox
{
public:
- IconView( vcl::Window* pParent, WinBits nBits );
+ IconView(vcl::Window* pParent, WinBits nBits);
virtual void Resize() override;
virtual tools::Rectangle GetFocusRect(const SvTreeListEntry*, tools::Long
nEntryPos) override;
- void PaintEntry( SvTreeListEntry&, tools::Long nX, tools::Long nY,
vcl::RenderContext& rRenderContext);
+ void PaintEntry(SvTreeListEntry&, tools::Long nX, tools::Long nY,
+ vcl::RenderContext& rRenderContext);
};
#endif
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index a937fb25fa55..f1269cabe75e 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -33,17 +33,18 @@ class IosSalFrame;
class IosSalInstance : public SvpSalInstance
{
public:
- IosSalInstance( std::unique_ptr<SalYieldMutex> pMutex );
+ IosSalInstance(std::unique_ptr<SalYieldMutex> pMutex);
virtual ~IosSalInstance();
- static IosSalInstance *getInstance();
+ static IosSalInstance* getInstance();
SalSystem* CreateSalSystem() override;
- css::uno::Reference< css::uno::XInterface > CreateClipboard( const
css::uno::Sequence< css::uno::Any >& i_rArguments ) override;
+ css::uno::Reference<css::uno::XInterface>
+ CreateClipboard(const css::uno::Sequence<css::uno::Any>& i_rArguments)
override;
- void GetWorkArea( tools::Rectangle& rRect );
- SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle )
override;
- SalFrame* CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags
nStyle ) override;
+ void GetWorkArea(tools::Rectangle& rRect);
+ SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
override;
+ SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags
nStyle) override;
};
#endif // INCLUDED_VCL_INC_IOS_IOSINST_HXX
diff --git a/vcl/inc/langboost.hxx b/vcl/inc/langboost.hxx
index 84bdb2d84111..77553de05c6b 100644
--- a/vcl/inc/langboost.hxx
+++ b/vcl/inc/langboost.hxx
@@ -11,7 +11,7 @@
namespace vcl
{
- const char* getLangBoost();
+const char* getLangBoost();
}
#endif
diff --git a/vcl/inc/opengl/BufferObject.hxx b/vcl/inc/opengl/BufferObject.hxx
index 396de89de0ed..e31148b74c6e 100644
--- a/vcl/inc/opengl/BufferObject.hxx
+++ b/vcl/inc/opengl/BufferObject.hxx
@@ -13,9 +13,7 @@
namespace vcl
{
-
-template<typename TYPE, GLenum BUFFER_TYPE>
-class BufferObject
+template <typename TYPE, GLenum BUFFER_TYPE> class BufferObject
{
private:
GLuint mId;
@@ -65,11 +63,9 @@ public:
CHECK_GL_ERROR();
}
}
-
};
-template<typename TYPE>
-class VertexBufferObject final : public BufferObject<TYPE, GL_ARRAY_BUFFER>
+template <typename TYPE> class VertexBufferObject final : public
BufferObject<TYPE, GL_ARRAY_BUFFER>
{
};
diff --git a/vcl/inc/opengl/TextureState.hxx b/vcl/inc/opengl/TextureState.hxx
index fbf2b9cee548..e285cd7704fa 100644
--- a/vcl/inc/opengl/TextureState.hxx
+++ b/vcl/inc/opengl/TextureState.hxx
@@ -23,7 +23,8 @@ public:
TextureState()
: mnCurrentTextureUnit(0)
, maBoundTextures(4, 0)
- {}
+ {
+ }
static void generate(GLuint& nTexture)
{
@@ -39,7 +40,6 @@ public:
CHECK_GL_ERROR();
mnCurrentTextureUnit = nTextureUnit;
}
-
}
void bind(GLuint nTexture)
@@ -66,11 +66,8 @@ public:
maBoundTextures[i] = 0;
}
}
-
};
-
-
#endif // INCLUDED_VCL_INC_OPENGL_TEXTURE_STATE_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index d86af9223c54..e55c6f1095ba 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -22,17 +22,17 @@ struct TextureCombo;
class X11OpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl, public
X11GraphicsImpl
{
private:
- X11SalGraphics& mrX11Parent;
+ X11SalGraphics& mrX11Parent;
public:
- X11OpenGLSalGraphicsImpl( X11SalGraphics& rParent );
+ X11OpenGLSalGraphicsImpl(X11SalGraphics& rParent);
virtual ~X11OpenGLSalGraphicsImpl() override;
protected:
virtual rtl::Reference<OpenGLContext> CreateWinContext() override;
public:
- virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics*
pSrcGraphics ) override;
+ virtual void copyBits(const SalTwoRect& rPosAry, SalGraphics*
pSrcGraphics) override;
virtual void Init() override;
};
diff --git a/vcl/inc/opengl/zone.hxx b/vcl/inc/opengl/zone.hxx
index 4bcdf15dcf79..f7f36ea22f84 100644
--- a/vcl/inc/opengl/zone.hxx
+++ b/vcl/inc/opengl/zone.hxx
@@ -19,23 +19,27 @@
* We want to be able to detect if a given crash came
* from the OpenGL code, so use this helper to track that.
*/
-class VCL_DLLPUBLIC OpenGLZone : public CrashZone< OpenGLZone > {
+class VCL_DLLPUBLIC OpenGLZone : public CrashZone<OpenGLZone>
+{
public:
static void hardDisable();
static void relaxWatchdogTimings();
static const CrashWatchdogTimingsValues& getCrashWatchdogTimingsValues();
- static void checkDebug( int nUnchanged, const CrashWatchdogTimingsValues&
aTimingValues );
+ static void checkDebug(int nUnchanged, const CrashWatchdogTimingsValues&
aTimingValues);
static const char* name() { return "OpenGL"; }
};
/// Create this to not only enter the zone, but set VCL context.
-class OpenGLVCLContextZone {
+class OpenGLVCLContextZone
+{
OpenGLZone aZone;
+
public:
OpenGLVCLContextZone();
};
-class VCL_DLLPUBLIC PreDefaultWinNoOpenGLZone {
+class VCL_DLLPUBLIC PreDefaultWinNoOpenGLZone
+{
public:
PreDefaultWinNoOpenGLZone();
~PreDefaultWinNoOpenGLZone();
diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
index a5355946786d..43aa6df66987 100644
--- a/vcl/inc/osx/a11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -28,20 +28,19 @@
#include <set>
#include <com/sun/star/awt/Rectangle.hpp>
-
-class AquaA11yEventListener :
- public ::cppu::WeakImplHelper<
css::accessibility::XAccessibleEventListener >
+class AquaA11yEventListener
+ : public
::cppu::WeakImplHelper<css::accessibility::XAccessibleEventListener>
{
-
public:
AquaA11yEventListener(id wrapperObject, sal_Int16 role);
virtual ~AquaA11yEventListener() override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source)
override;
// XAccessibleEventListener
- virtual void SAL_CALL notifyEvent( const
css::accessibility::AccessibleEventObject& aEvent ) override;
+ virtual void SAL_CALL
+ notifyEvent(const css::accessibility::AccessibleEventObject& aEvent)
override;
private:
const id m_wrapperObject;
diff --git a/vcl/inc/osx/keyboardfocuslistener.hxx
b/vcl/inc/osx/keyboardfocuslistener.hxx
index 1da1c845293a..9589a471e733 100644
--- a/vcl/inc/osx/keyboardfocuslistener.hxx
+++ b/vcl/inc/osx/keyboardfocuslistener.hxx
@@ -25,11 +25,12 @@
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
-
class KeyboardFocusListener : public salhelper::SimpleReferenceObject
{
public:
- virtual void focusedObjectChanged(const css::uno::Reference<
css::accessibility::XAccessible >& xAccessible) = 0;
+ virtual void
+ focusedObjectChanged(const
css::uno::Reference<css::accessibility::XAccessible>& xAccessible)
+ = 0;
};
#endif // INCLUDED_VCL_INC_OSX_KEYBOARDFOCUSLISTENER_HXX
diff --git a/vcl/inc/osx/salnsmenu.h b/vcl/inc/osx/salnsmenu.h
index f815c14c006d..696abca2fc0b 100644
--- a/vcl/inc/osx/salnsmenu.h
+++ b/vcl/inc/osx/salnsmenu.h
@@ -26,26 +26,26 @@ class AquaSalMenuItem;
@interface OOStatusItemView : NSView
{
}
--(void)drawRect: (NSRect)aRect;
--(void)layout;
--(void)mouseUp: (NSEvent *)pEvent;
+- (void)drawRect:(NSRect)aRect;
+- (void)layout;
+- (void)mouseUp:(NSEvent*)pEvent;
@end
@interface SalNSMenu : NSMenu
{
- AquaSalMenu* mpMenu;
+ AquaSalMenu* mpMenu;
}
--(id)initWithMenu: (AquaSalMenu*)pMenu;
--(void)menuNeedsUpdate: (NSMenu*)pMenu;
--(void)setSalMenu: (AquaSalMenu*)pMenu;
+- (id)initWithMenu:(AquaSalMenu*)pMenu;
+- (void)menuNeedsUpdate:(NSMenu*)pMenu;
+- (void)setSalMenu:(AquaSalMenu*)pMenu;
@end
@interface SalNSMenuItem : NSMenuItem
{
- AquaSalMenuItem* mpMenuItem;
+ AquaSalMenuItem* mpMenuItem;
}
--(id)initWithMenuItem: (AquaSalMenuItem*)pMenuItem;
--(void)menuItemTriggered: (id)aSender;
+- (id)initWithMenuItem:(AquaSalMenuItem*)pMenuItem;
+- (void)menuItemTriggered:(id)aSender;
@end
#endif // INCLUDED_VCL_INC_OSX_SALNSMENU_H
diff --git a/vcl/inc/osx/salnstimer.h b/vcl/inc/osx/salnstimer.h
index d1928fe9d671..5c831cdf45fe 100644
--- a/vcl/inc/osx/salnstimer.h
+++ b/vcl/inc/osx/salnstimer.h
@@ -27,7 +27,7 @@
@interface TimerCallbackCaller : NSObject
{
}
--(void)timerElapsed:(NSTimer*)pTimer;
+- (void)timerElapsed:(NSTimer*)pTimer;
@end
#endif // INCLUDED_VCL_INC_OSX_SALNSTIMER_H
diff --git a/vcl/inc/quartz/ctfonts.hxx b/vcl/inc/quartz/ctfonts.hxx
index 89cc554439ba..431385aeeda6 100644
--- a/vcl/inc/quartz/ctfonts.hxx
+++ b/vcl/inc/quartz/ctfonts.hxx
@@ -24,7 +24,7 @@
#include <sallayout.hxx>
SystemFontList* GetCoretextFontList();
-FontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef, bool* );
+FontAttributes DevFontFromCTFontDescriptor(CTFontDescriptorRef, bool*);
#endif // INCLUDED_VCL_INC_QUARTZ_CTFONTS_HXX
diff --git a/vcl/inc/regionband.hxx b/vcl/inc/regionband.hxx
index 30a75ac015de..b722be430e6a 100644
--- a/vcl/inc/regionband.hxx
+++ b/vcl/inc/regionband.hxx
@@ -32,8 +32,8 @@ class RegionBand
private:
friend const char* ImplDbgTestRegionBand(const void*);
- ImplRegionBand* mpFirstBand; // root of the list with
y-bands
- ImplRegionBand* mpLastCheckedBand;
+ ImplRegionBand* mpFirstBand; // root of the list with y-bands
+ ImplRegionBand* mpLastCheckedBand;
void implReset();
[[nodiscard]] bool CheckConsistency() const;
@@ -45,7 +45,7 @@ public:
RegionBand(const tools::Rectangle&);
~RegionBand();
- bool operator==( const RegionBand& rRegionBand ) const;
+ bool operator==(const RegionBand& rRegionBand) const;
[[nodiscard]] bool load(SvStream& rIStrm);
void save(SvStream& rIStrm) const;
@@ -57,7 +57,7 @@ public:
void processPoints();
void CreateBandRange(tools::Long nYTop, tools::Long nYBottom);
void InsertLine(const Point& rStartPt, const Point& rEndPt, tools::Long
nLineId);
- void InsertPoint(const Point &rPoint, tools::Long nLineID, bool bEndPoint,
LineType eLineType);
+ void InsertPoint(const Point& rPoint, tools::Long nLineID, bool bEndPoint,
LineType eLineType);
bool OptimizeBandList();
void Move(tools::Long nHorzMove, tools::Long nVertMove);
void Scale(double fScaleX, double fScaleY);
@@ -73,7 +73,8 @@ public:
void XOr(const RegionBand& rSource);
tools::Rectangle GetBoundRect() const;
bool IsInside(const Point& rPoint) const;
- sal_uInt32 getRectangleCount() const; // only users are Region::Intersect,
Region::IsRectangle and PSWriter::ImplBmp
+ sal_uInt32 getRectangleCount()
+ const; // only users are Region::Intersect, Region::IsRectangle and
PSWriter::ImplBmp
void GetRegionRectangles(RectangleVector& rTarget) const;
};
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index fc80e90d0ca9..cf89bff59259 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -25,12 +25,12 @@
#include <rtl/ustring.hxx>
// Button identifier for ShowNativeMessageBox
-const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK = 1;
+const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_OK = 1;
class VCL_PLUGIN_PUBLIC SalSystem
{
public:
- SalSystem() {}
+ SalSystem() {}
virtual ~SalSystem();
// get info about the display
@@ -63,7 +63,7 @@ public:
else position relative to whole display
size: size of the screen
*/
- virtual tools::Rectangle GetDisplayScreenPosSizePixel( unsigned int
nScreen ) = 0;
+ virtual tools::Rectangle GetDisplayScreenPosSizePixel(unsigned int
nScreen) = 0;
/* Shows a native message box with the specified title, message and button
combination.
@@ -78,9 +78,7 @@ public:
See button identifier above. If the function fails the
return value is 0.
*/
- virtual int ShowNativeMessageBox( const OUString& rTitle,
- const OUString& rMessage ) = 0;
-
+ virtual int ShowNativeMessageBox(const OUString& rTitle, const OUString&
rMessage) = 0;
};
VCL_DLLPUBLIC SalSystem* ImplGetSalSystem();
diff --git a/vcl/inc/scanlinewriter.hxx b/vcl/inc/scanlinewriter.hxx
index 6be9623023cd..43334f955c50 100644
--- a/vcl/inc/scanlinewriter.hxx
+++ b/vcl/inc/scanlinewriter.hxx
@@ -25,31 +25,32 @@
namespace vcl
{
-
// Write color information for 1, 4 and 8 bit palette bitmap scanlines.
class ScanlineWriter
{
BitmapPalette& maPalette;
sal_uInt8 const mnColorsPerByte; // number of colors that are stored in
one byte
- sal_uInt8 const mnColorBitSize; // number of bits a color takes
- sal_uInt8 const mnColorBitMask; // bit mask used to isolate the color
+ sal_uInt8 const mnColorBitSize; // number of bits a color takes
+ sal_uInt8 const mnColorBitMask; // bit mask used to isolate the color
sal_uInt8* mpCurrentScanline;
tools::Long mnX;
public:
-
ScanlineWriter(BitmapPalette& aPalette, sal_Int8 nColorsPerByte)
: maPalette(aPalette)
, mnColorsPerByte(nColorsPerByte)
- , mnColorBitSize(8 / mnColorsPerByte) // bit size is number of bit in
a byte divided by number of colors per byte (8 / 2 = 4 for 4-bit)
+ , mnColorBitSize(
+ 8
+ / mnColorsPerByte) // bit size is number of bit in a byte
divided by number of colors per byte (8 / 2 = 4 for 4-bit)
, mnColorBitMask((1 << mnColorBitSize) - 1) // calculate the bit mask
from the bit size
, mpCurrentScanline(nullptr)
, mnX(0)
- {}
+ {
+ }
static std::unique_ptr<ScanlineWriter> Create(sal_uInt16 nBits,
BitmapPalette& aPalette)
{
- switch(nBits)
+ switch (nBits)
{
case 1:
return std::make_unique<ScanlineWriter>(aPalette, 8);
diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h
index b663deeed7d9..db2a778cf24a 100644
--- a/vcl/inc/scrptrun.h
+++ b/vcl/inc/scrptrun.h
@@ -43,22 +43,22 @@
#include <unicode/uscript.h>
#include <vector>
-namespace vcl {
-
+namespace vcl
+{
struct ParenStackEntry
{
int32_t pairIndex;
UScriptCode scriptCode;
ParenStackEntry()
- : pairIndex(0)
- , scriptCode(USCRIPT_INVALID_CODE)
+ : pairIndex(0)
+ , scriptCode(USCRIPT_INVALID_CODE)
{
}
};
-class ScriptRun final : public icu::UObject {
+class ScriptRun final : public icu::UObject
+{
public:
-
ScriptRun(const UChar chars[], int32_t length);
void reset();
@@ -87,13 +87,15 @@ s * ICU "poor man's RTTI", returns a UClassID for the
actual class.
*
* @stable ICU 2.2
*/
- static UClassID getStaticClassID() { return
static_cast<UClassID>(const_cast<char *>(&fgClassID)); }
+ static UClassID getStaticClassID()
+ {
+ return static_cast<UClassID>(const_cast<char*>(&fgClassID));
+ }
private:
-
int32_t charStart;
int32_t charLimit;
- const UChar *charArray;
+ const UChar* charArray;
int32_t scriptStart;
int32_t scriptEnd;
@@ -109,32 +111,20 @@ private:
static const char fgClassID;
};
-inline ScriptRun::ScriptRun(const UChar chars[], int32_t length)
-{
- reset(chars, 0, length);
-}
+inline ScriptRun::ScriptRun(const UChar chars[], int32_t length) {
reset(chars, 0, length); }
-inline int32_t ScriptRun::getScriptStart() const
-{
- return scriptStart;
-}
+inline int32_t ScriptRun::getScriptStart() const { return scriptStart; }
-inline int32_t ScriptRun::getScriptEnd() const
-{
- return scriptEnd;
-}
+inline int32_t ScriptRun::getScriptEnd() const { return scriptEnd; }
-inline UScriptCode ScriptRun::getScriptCode() const
-{
- return scriptCode;
-}
+inline UScriptCode ScriptRun::getScriptCode() const { return scriptCode; }
inline void ScriptRun::reset()
{
scriptStart = charStart;
- scriptEnd = charStart;
- scriptCode = USCRIPT_INVALID_CODE;
- parenSP = -1;
+ scriptEnd = charStart;
+ scriptCode = USCRIPT_INVALID_CODE;
+ parenSP = -1;
parenStack.resize(128);
}
@@ -152,7 +142,6 @@ inline void ScriptRun::reset(const UChar chars[], int32_t
start, int32_t length)
reset(start, length);
}
-
}
#endif
diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx
index 531e4c64272b..0abb6aa71339 100644
--- a/vcl/inc/unx/desktops.hxx
+++ b/vcl/inc/unx/desktops.hxx
@@ -24,7 +24,8 @@
#include <sal/types.h>
-enum SAL_DLLPUBLIC_RTTI DesktopType {
+enum SAL_DLLPUBLIC_RTTI DesktopType
+{
DESKTOP_NONE, // headless, i.e. no X connection at all
DESKTOP_UNKNOWN, // unknown desktop, simple WM, etc.
DESKTOP_GNOME,
diff --git a/vcl/inc/unx/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx
index 3189087398f4..a6c8d49a911d 100644
--- a/vcl/inc/unx/i18n_keysym.hxx
+++ b/vcl/inc/unx/i18n_keysym.hxx
@@ -60,7 +60,7 @@
of course not all keysyms can be mapped to a unicode code point
*/
-sal_Unicode KeysymToUnicode (KeySym nKeySym);
+sal_Unicode KeysymToUnicode(KeySym nKeySym);
#endif // INCLUDED_VCL_INC_UNX_I18N_KEYSYM_HXX
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h
index 70fb0e4d0a58..f8e36d15cd5c 100644
--- a/vcl/inc/unx/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -22,8 +22,10 @@
#include <tools/long.hxx>
-inline tools::Long Divide( tools::Long nDividend, tools::Long nDivisor )
-{ return (nDividend + nDivisor/2) / nDivisor; }
+inline tools::Long Divide(tools::Long nDividend, tools::Long nDivisor)
+{
+ return (nDividend + nDivisor / 2) / nDivisor;
+}
#endif
diff --git a/vcl/inc/unx/screensaverinhibitor.hxx
b/vcl/inc/unx/screensaverinhibitor.hxx
index 58c00e7fa382..f9de1c8530ce 100644
--- a/vcl/inc/unx/screensaverinhibitor.hxx
+++ b/vcl/inc/unx/screensaverinhibitor.hxx
@@ -21,8 +21,8 @@
class VCL_PLUGIN_PUBLIC ScreenSaverInhibitor
{
public:
- void inhibit( bool bInhibit, const OUString& sReason,
- bool bIsX11, const std::optional<unsigned int>& xid,
std::optional<Display*> pDisplay );
+ void inhibit(bool bInhibit, const OUString& sReason, bool bIsX11,
+ const std::optional<unsigned int>& xid,
std::optional<Display*> pDisplay);
private:
// These are all used as guint, however this header may be included
@@ -56,14 +56,14 @@ private:
// (This is replaced by the GSM interface from Mate 1.12 onwards)
//
// Note: the Uninhibit call has different spelling in FDO (UnInhibit) vs
GSM (Uninhibit)
- void inhibitFDO( bool bInhibit, const char* appname, const char* reason );
- void inhibitFDOPM( bool bInhibit, const char* appname, const char* reason
);
- void inhibitGSM( bool bInhibit, const char* appname, const char* reason,
const unsigned int xid );
- void inhibitMSM( bool bInhibit, const char* appname, const char* reason,
const unsigned int xid );
+ void inhibitFDO(bool bInhibit, const char* appname, const char* reason);
+ void inhibitFDOPM(bool bInhibit, const char* appname, const char* reason);
+ void inhibitGSM(bool bInhibit, const char* appname, const char* reason,
const unsigned int xid);
+ void inhibitMSM(bool bInhibit, const char* appname, const char* reason,
const unsigned int xid);
- void inhibitXScreenSaver( bool bInhibit, Display* pDisplay );
- static void inhibitXAutoLock( bool bInhibit, Display* pDisplay );
- void inhibitDPMS( bool bInhibit, Display* pDisplay );
+ void inhibitXScreenSaver(bool bInhibit, Display* pDisplay);
+ static void inhibitXAutoLock(bool bInhibit, Display* pDisplay);
+ void inhibitDPMS(bool bInhibit, Display* pDisplay);
};
#endif // INCLUDED_VCL_INC_UNX_SCREENSAVERINHIBITOR_HXX
diff --git a/vcl/inc/unx/x11/x11gdiimpl.h b/vcl/inc/unx/x11/x11gdiimpl.h
index 342da0907517..43e4c6bda99e 100644
--- a/vcl/inc/unx/x11/x11gdiimpl.h
+++ b/vcl/inc/unx/x11/x11gdiimpl.h
@@ -17,8 +17,8 @@ class ControlCacheKey;
class X11GraphicsImpl
{
public:
- virtual ~X11GraphicsImpl() {};
- virtual void Flush() {};
+ virtual ~X11GraphicsImpl(){};
+ virtual void Flush(){};
};
#endif // INCLUDED_VCL_INC_UNX_X11_X11GDIIMPL_HXX
diff --git a/vcl/inc/unx/x11_cursors/wshide_curs.h
b/vcl/inc/unx/x11_cursors/wshide_curs.h
index e8fd2723024c..8f6d81541520 100644
--- a/vcl/inc/unx/x11_cursors/wshide_curs.h
+++ b/vcl/inc/unx/x11_cursors/wshide_curs.h
@@ -22,8 +22,8 @@
#define hidewhitespace_curs_x_hot 0
#define hidewhitespace_curs_y_hot 10
static unsigned char hidewhitespace_curs_bits[] = {
- 0x00, 0x01, 0x00, 0x01, 0xC0, 0x07, 0x80, 0x03, 0x00, 0x01, 0xFF, 0xFF,
- 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0xFF, 0xFF, 0x00, 0x01,
- 0x80, 0x03, 0xC0, 0x07, 0x00, 0x01, 0x00, 0x01, };
+ 0x00, 0x01, 0x00, 0x01, 0xC0, 0x07, 0x80, 0x03, 0x00, 0x01, 0xFF, 0xFF,
0x01, 0x80, 0x01, 0x80,
+ 0x01, 0x80, 0x01, 0x80, 0xFF, 0xFF, 0x00, 0x01, 0x80, 0x03, 0xC0, 0x07,
0x00, 0x01, 0x00, 0x01,
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/wshide_mask.h
b/vcl/inc/unx/x11_cursors/wshide_mask.h
index 8547baa25183..50bd0c3f023f 100644
--- a/vcl/inc/unx/x11_cursors/wshide_mask.h
+++ b/vcl/inc/unx/x11_cursors/wshide_mask.h
@@ -22,8 +22,8 @@
#define hidewhitespace_mask_x_hot 0
#define hidewhitespace_mask_y_hot 10
static unsigned char hidewhitespace_mask_bits[] = {
- 0x00, 0x01, 0x00, 0x01, 0xC0, 0x07, 0x80, 0x03, 0x00, 0x01, 0xFF, 0xFF,
- 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0xFF, 0xFF, 0x00, 0x01,
- 0x80, 0x03, 0xC0, 0x07, 0x00, 0x01, 0x00, 0x01, };
+ 0x00, 0x01, 0x00, 0x01, 0xC0, 0x07, 0x80, 0x03, 0x00, 0x01, 0xFF, 0xFF,
0x01, 0x80, 0x01, 0x80,
+ 0x01, 0x80, 0x01, 0x80, 0xFF, 0xFF, 0x00, 0x01, 0x80, 0x03, 0xC0, 0x07,
0x00, 0x01, 0x00, 0x01,
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/wsshow_curs.h
b/vcl/inc/unx/x11_cursors/wsshow_curs.h
index 56b705e69796..8b30f6e8f4fb 100644
--- a/vcl/inc/unx/x11_cursors/wsshow_curs.h
+++ b/vcl/inc/unx/x11_cursors/wsshow_curs.h
@@ -22,8 +22,8 @@
#define showwhitespace_curs_x_hot 0
#define showwhitespace_curs_y_hot 10
static unsigned char showwhitespace_curs_bits[] = {
- 0x00, 0x01, 0x80, 0x03, 0xC0, 0x07, 0x00, 0x01, 0xFF, 0xFF, 0x01, 0x81,
- 0x01, 0x81, 0x01, 0x81, 0x01, 0x81, 0x01, 0x81, 0x01, 0x81, 0xFF, 0xFF,
- 0x00, 0x01, 0xC0, 0x07, 0x80, 0x03, 0x00, 0x01, };
+ 0x00, 0x01, 0x80, 0x03, 0xC0, 0x07, 0x00, 0x01, 0xFF, 0xFF, 0x01, 0x81,
0x01, 0x81, 0x01, 0x81,
+ 0x01, 0x81, 0x01, 0x81, 0x01, 0x81, 0xFF, 0xFF, 0x00, 0x01, 0xC0, 0x07,
0x80, 0x03, 0x00, 0x01,
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/x11_cursors/wsshow_mask.h
b/vcl/inc/unx/x11_cursors/wsshow_mask.h
index 2da7aea99094..bba14181d8e6 100644
--- a/vcl/inc/unx/x11_cursors/wsshow_mask.h
+++ b/vcl/inc/unx/x11_cursors/wsshow_mask.h
@@ -22,8 +22,8 @@
#define showwhitespace_mask_x_hot 0
#define showwhitespace_mask_y_hot 10
static unsigned char showwhitespace_mask_bits[] = {
- 0x00, 0x01, 0x80, 0x03, 0xC0, 0x07, 0x00, 0x01, 0xFF, 0xFF, 0x01, 0x81,
- 0x01, 0x81, 0x01, 0x81, 0x01, 0x81, 0x01, 0x81, 0x01, 0x81, 0xFF, 0xFF,
- 0x00, 0x01, 0xC0, 0x07, 0x80, 0x03, 0x00, 0x01, };
+ 0x00, 0x01, 0x80, 0x03, 0xC0, 0x07, 0x00, 0x01, 0xFF, 0xFF, 0x01, 0x81,
0x01, 0x81, 0x01, 0x81,
+ 0x01, 0x81, 0x01, 0x81, 0x01, 0x81, 0xFF, 0xFF, 0x00, 0x01, 0xC0, 0x07,
0x80, 0x03, 0x00, 0x01,
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcleventlisteners.hxx b/vcl/inc/vcleventlisteners.hxx
index a733499065f6..47a84e3b80bc 100644
--- a/vcl/inc/vcleventlisteners.hxx
+++ b/vcl/inc/vcleventlisteners.hxx
@@ -25,11 +25,12 @@
class VclEventListeners
{
public:
- void Call( VclSimpleEvent& rEvent ) const;
- void addListener( const Link<VclSimpleEvent&,void>& rListener );
- void removeListener( const Link<VclSimpleEvent&,void>& rListener );
+ void Call(VclSimpleEvent& rEvent) const;
+ void addListener(const Link<VclSimpleEvent&, void>& rListener);
+ void removeListener(const Link<VclSimpleEvent&, void>& rListener);
+
private:
- std::vector<Link<VclSimpleEvent&,void>> m_aListeners;
+ std::vector<Link<VclSimpleEvent&, void>> m_aListeners;
};
#endif // INCLUDED_VCL_INC_VCLEVENTLISTENERS_HXX
diff --git a/vcl/opengl/DeviceInfo.cxx b/vcl/opengl/DeviceInfo.cxx
index 24f42e34e481..f4bce64a88d8 100644
--- a/vcl/opengl/DeviceInfo.cxx
+++ b/vcl/opengl/DeviceInfo.cxx
@@ -9,8 +9,6 @@
#include <opengl/DeviceInfo.hxx>
-OpenGLDeviceInfo::~OpenGLDeviceInfo()
-{
-}
+OpenGLDeviceInfo::~OpenGLDeviceInfo() {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/DragActionConversion.cxx b/vcl/osx/DragActionConversion.cxx
index 3af6cd010a3f..d44c3384a6fc 100644
--- a/vcl/osx/DragActionConversion.cxx
+++ b/vcl/osx/DragActionConversion.cxx
@@ -28,24 +28,24 @@ using namespace com::sun::star::datatransfer::dnd;
*/
unsigned int OfficeToSystemDragActions(sal_Int8 dragActions)
{
- unsigned int actions = NSDragOperationNone;
+ unsigned int actions = NSDragOperationNone;
- if (dragActions & DNDConstants::ACTION_COPY)
+ if (dragActions & DNDConstants::ACTION_COPY)
{
- actions |= NSDragOperationCopy;
+ actions |= NSDragOperationCopy;
}
- if (dragActions & DNDConstants::ACTION_MOVE)
+ if (dragActions & DNDConstants::ACTION_MOVE)
{
- actions |= NSDragOperationMove;
+ actions |= NSDragOperationMove;
}
- if (dragActions & DNDConstants::ACTION_LINK)
+ if (dragActions & DNDConstants::ACTION_LINK)
{
- actions |= NSDragOperationLink;
+ actions |= NSDragOperationLink;
}
- return actions;
+ return actions;
}
/* Convert system conform drag actions into office conform
@@ -54,31 +54,31 @@ unsigned int OfficeToSystemDragActions(sal_Int8 dragActions)
*/
sal_Int8 SystemToOfficeDragActions(unsigned int dragActions)
{
- sal_Int8 actions = DNDConstants::ACTION_NONE;
+ sal_Int8 actions = DNDConstants::ACTION_NONE;
- if (dragActions & NSDragOperationCopy)
+ if (dragActions & NSDragOperationCopy)
{
- actions |= DNDConstants::ACTION_COPY;
+ actions |= DNDConstants::ACTION_COPY;
}
- if (dragActions & NSDragOperationMove)
+ if (dragActions & NSDragOperationMove)
{
- actions |= DNDConstants::ACTION_MOVE;
+ actions |= DNDConstants::ACTION_MOVE;
}
- if (dragActions & NSDragOperationLink)
+ if (dragActions & NSDragOperationLink)
{
- actions |= DNDConstants::ACTION_LINK;
+ actions |= DNDConstants::ACTION_LINK;
}
- // We map NSDragOperationGeneric to ACTION_DEFAULT to
- // signal that we have to decide for a drag action
- if (dragActions & NSDragOperationGeneric)
+ // We map NSDragOperationGeneric to ACTION_DEFAULT to
+ // signal that we have to decide for a drag action
+ if (dragActions & NSDragOperationGeneric)
{
- actions |= DNDConstants::ACTION_DEFAULT;
+ actions |= DNDConstants::ACTION_DEFAULT;
}
- return actions;
+ return actions;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/PictToBmpFlt.hxx b/vcl/osx/PictToBmpFlt.hxx
index 027bd178bc3a..e0e111818d99 100644
--- a/vcl/osx/PictToBmpFlt.hxx
+++ b/vcl/osx/PictToBmpFlt.hxx
@@ -26,12 +26,11 @@
#include <Cocoa/Cocoa.h>
#include <postmac.h>
-bool ImageToPNG( css::uno::Sequence<sal_Int8> const & rImgData,
- css::uno::Sequence<sal_Int8>& rPngData);
+bool ImageToPNG(css::uno::Sequence<sal_Int8> const& rImgData,
+ css::uno::Sequence<sal_Int8>& rPngData);
-bool PNGToImage( css::uno::Sequence<sal_Int8> const & rPngData,
- css::uno::Sequence<sal_Int8>& rImgData,
- NSBitmapImageFileType eOutFormat);
+bool PNGToImage(css::uno::Sequence<sal_Int8> const& rPngData,
+ css::uno::Sequence<sal_Int8>& rImgData, NSBitmapImageFileType
eOutFormat);
#endif // INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX
diff --git a/vcl/osx/a11yactionwrapper.h b/vcl/osx/a11yactionwrapper.h
index 20b2bad1b4af..51da8a2caf38 100644
--- a/vcl/osx/a11yactionwrapper.h
+++ b/vcl/osx/a11yactionwrapper.h
@@ -26,8 +26,8 @@
@interface AquaA11yActionWrapper : NSObject
{
}
-+(NSArray *)actionNamesForElement:(AquaA11yWrapper *)wrapper;
-+(void)doAction:(NSString *)action ofElement:(AquaA11yWrapper *)wrapper;
++ (NSArray*)actionNamesForElement:(AquaA11yWrapper*)wrapper;
++ (void)doAction:(NSString*)action ofElement:(AquaA11yWrapper*)wrapper;
@end
#endif // INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
diff --git a/vcl/osx/a11ycomponentwrapper.h b/vcl/osx/a11ycomponentwrapper.h
index 92c6b1b493fd..3d8b16929279 100644
--- a/vcl/osx/a11ycomponentwrapper.h
+++ b/vcl/osx/a11ycomponentwrapper.h
@@ -26,12 +26,12 @@
@interface AquaA11yComponentWrapper : NSObject
{
}
-+(id)sizeAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)positionAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)descriptionAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(void)addAttributeNamesTo:(NSMutableArray *)attributeNames;
-+(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper
*)wrapper;
-+(void)setFocusedAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
++ (id)sizeAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)positionAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)descriptionAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (void)addAttributeNamesTo:(NSMutableArray*)attributeNames;
++ (BOOL)isAttributeSettable:(NSString*)attribute
forElement:(AquaA11yWrapper*)wrapper;
++ (void)setFocusedAttributeForElement:(AquaA11yWrapper*)wrapper to:(id)value;
@end
#endif // INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
diff --git a/vcl/osx/a11yfocuslistener.hxx b/vcl/osx/a11yfocuslistener.hxx
index 44a25cce0b8f..fdd28ac230c2 100644
--- a/vcl/osx/a11yfocuslistener.hxx
+++ b/vcl/osx/a11yfocuslistener.hxx
@@ -27,18 +27,19 @@ class AquaA11yFocusListener : public KeyboardFocusListener
{
id m_focusedObject;
- static rtl::Reference< AquaA11yFocusListener > theListener;
+ static rtl::Reference<AquaA11yFocusListener> theListener;
AquaA11yFocusListener();
- virtual ~AquaA11yFocusListener() override {};
-public:
+ virtual ~AquaA11yFocusListener() override{};
- static rtl::Reference< AquaA11yFocusListener > const & get();
+public:
+ static rtl::Reference<AquaA11yFocusListener> const& get();
id getFocusedUIElement();
// KeyboardFocusListener
- virtual void focusedObjectChanged(const css::uno::Reference<
css::accessibility::XAccessible >& xAccessible) override;
+ virtual void focusedObjectChanged(
+ const css::uno::Reference<css::accessibility::XAccessible>&
xAccessible) override;
};
#endif // INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
diff --git a/vcl/osx/a11yselectionwrapper.h b/vcl/osx/a11yselectionwrapper.h
index 923737b652c7..880281a114ed 100644
--- a/vcl/osx/a11yselectionwrapper.h
+++ b/vcl/osx/a11yselectionwrapper.h
@@ -26,10 +26,10 @@
@interface AquaA11ySelectionWrapper : NSObject
{
}
-+(id)selectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(void)addAttributeNamesTo:(NSMutableArray *)attributeNames;
-+(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper
*)wrapper;
-+(void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper
to:(id)value;
++ (id)selectedChildrenAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (void)addAttributeNamesTo:(NSMutableArray*)attributeNames;
++ (BOOL)isAttributeSettable:(NSString*)attribute
forElement:(AquaA11yWrapper*)wrapper;
++ (void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper*)wrapper
to:(id)value;
@end
#endif // INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
diff --git a/vcl/osx/a11ytablewrapper.h b/vcl/osx/a11ytablewrapper.h
index 450a829c12f3..ae2c454a81f0 100644
--- a/vcl/osx/a11ytablewrapper.h
+++ b/vcl/osx/a11ytablewrapper.h
@@ -27,11 +27,11 @@
@interface AquaA11yTableWrapper : AquaA11yWrapper
{
}
-+(id)childrenAttributeForElement:(AquaA11yTableWrapper *)wrapper;
-+(void)addAttributeNamesTo: (NSMutableArray *)attributeNames object:
(AquaA11yWrapper*)pObject;
++ (id)childrenAttributeForElement:(AquaA11yTableWrapper*)wrapper;
++ (void)addAttributeNamesTo:(NSMutableArray*)attributeNames
object:(AquaA11yWrapper*)pObject;
--(id)rowsAttribute;
--(id)columnsAttribute;
+- (id)rowsAttribute;
+- (id)columnsAttribute;
@end
#endif // INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
diff --git a/vcl/osx/a11ytextwrapper.h b/vcl/osx/a11ytextwrapper.h
index 5d2154ff6298..356f664fbfa8 100644
--- a/vcl/osx/a11ytextwrapper.h
+++ b/vcl/osx/a11ytextwrapper.h
@@ -26,31 +26,31 @@
@interface AquaA11yTextWrapper : NSObject
{
}
-+(id)valueAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)numberOfCharactersAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)selectedTextAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)selectedTextRangeAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)visibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)stringForRangeAttributeForElement:(AquaA11yWrapper *)wrapper
forParameter:(id)range;
-+(id)attributedStringForRangeAttributeForElement:(AquaA11yWrapper *)wrapper
forParameter:(id)range;
-+(id)rangeForIndexAttributeForElement:(AquaA11yWrapper *)wrapper
forParameter:(id)index;
-+(id)rangeForPositionAttributeForElement:(AquaA11yWrapper *)wrapper
forParameter:(id)point;
-+(id)boundsForRangeAttributeForElement:(AquaA11yWrapper *)wrapper
forParameter:(id)range;
-+(id)styleRangeForIndexAttributeForElement:(AquaA11yWrapper *)wrapper
forParameter:(id)index;
-+(id)rTFForRangeAttributeForElement:(AquaA11yWrapper *)wrapper
forParameter:(id)range;
-+(id)lineForIndexAttributeForElement:(AquaA11yWrapper *)wrapper
forParameter:(id)index;
-+(id)rangeForLineAttributeForElement:(AquaA11yWrapper *)wrapper
forParameter:(id)line;
-+(void)addAttributeNamesTo:(NSMutableArray *)attributeNames;
-+(void)addParameterizedAttributeNamesTo:(NSMutableArray *)attributeNames;
-+(NSArray *)specialAttributeNames;
-+(NSArray *)specialParameterizedAttributeNames;
-+(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper
*)wrapper;
-+(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper
to:(id)value;
-+(void)setSelectedTextRangeAttributeForElement:(AquaA11yWrapper *)wrapper
to:(id)value;
-+(void)setSelectedTextAttributeForElement:(AquaA11yWrapper *)wrapper
to:(id)value;
-+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
++ (id)valueAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)numberOfCharactersAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)selectedTextAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)selectedTextRangeAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)visibleCharacterRangeAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)stringForRangeAttributeForElement:(AquaA11yWrapper*)wrapper
forParameter:(id)range;
++ (id)attributedStringForRangeAttributeForElement:(AquaA11yWrapper*)wrapper
forParameter:(id)range;
++ (id)rangeForIndexAttributeForElement:(AquaA11yWrapper*)wrapper
forParameter:(id)index;
++ (id)rangeForPositionAttributeForElement:(AquaA11yWrapper*)wrapper
forParameter:(id)point;
++ (id)boundsForRangeAttributeForElement:(AquaA11yWrapper*)wrapper
forParameter:(id)range;
++ (id)styleRangeForIndexAttributeForElement:(AquaA11yWrapper*)wrapper
forParameter:(id)index;
++ (id)rTFForRangeAttributeForElement:(AquaA11yWrapper*)wrapper
forParameter:(id)range;
++ (id)lineForIndexAttributeForElement:(AquaA11yWrapper*)wrapper
forParameter:(id)index;
++ (id)rangeForLineAttributeForElement:(AquaA11yWrapper*)wrapper
forParameter:(id)line;
++ (void)addAttributeNamesTo:(NSMutableArray*)attributeNames;
++ (void)addParameterizedAttributeNamesTo:(NSMutableArray*)attributeNames;
++ (NSArray*)specialAttributeNames;
++ (NSArray*)specialParameterizedAttributeNames;
++ (BOOL)isAttributeSettable:(NSString*)attribute
forElement:(AquaA11yWrapper*)wrapper;
++ (void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper*)wrapper
to:(id)value;
++ (void)setSelectedTextRangeAttributeForElement:(AquaA11yWrapper*)wrapper
to:(id)value;
++ (void)setSelectedTextAttributeForElement:(AquaA11yWrapper*)wrapper
to:(id)value;
++ (void)setValueAttributeForElement:(AquaA11yWrapper*)wrapper to:(id)value;
@end
#endif // INCLUDED_VCL_OSX_A11YTEXTWRAPPER_H
diff --git a/vcl/osx/a11yutil.h b/vcl/osx/a11yutil.h
index 56778e76dd80..7edf60b292a5 100644
--- a/vcl/osx/a11yutil.h
+++ b/vcl/osx/a11yutil.h
@@ -22,10 +22,11 @@
#include <com/sun/star/awt/Point.hpp>
-@interface AquaA11yUtil : NSObject {
+@interface AquaA11yUtil : NSObject
+{
}
-+(NSValue *)vclPointToNSPoint:(css::awt::Point)vclPoint;
-+(css::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint;
++ (NSValue*)vclPointToNSPoint:(css::awt::Point)vclPoint;
++ (css::awt::Point)nsPointToVclPoint:(NSValue*)nsPoint;
@end
#endif // INCLUDED_VCL_OSX_A11YUTIL_H
diff --git a/vcl/osx/a11yvaluewrapper.h b/vcl/osx/a11yvaluewrapper.h
index b4db1de964ab..686006b94800 100644
--- a/vcl/osx/a11yvaluewrapper.h
+++ b/vcl/osx/a11yvaluewrapper.h
@@ -27,12 +27,12 @@
@interface AquaA11yValueWrapper : NSObject
{
}
-+(id)valueAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)minValueAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(id)maxValueAttributeForElement:(AquaA11yWrapper *)wrapper;
-+(void)addAttributeNamesTo:(NSMutableArray *)attributeNames;
-+(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper
*)wrapper;
-+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
++ (id)valueAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)minValueAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (id)maxValueAttributeForElement:(AquaA11yWrapper*)wrapper;
++ (void)addAttributeNamesTo:(NSMutableArray*)attributeNames;
++ (BOOL)isAttributeSettable:(NSString*)attribute
forElement:(AquaA11yWrapper*)wrapper;
++ (void)setValueAttributeForElement:(AquaA11yWrapper*)wrapper to:(id)value;
@end
#endif // INCLUDED_VCL_OSX_A11YVALUEWRAPPER_H
diff --git a/vcl/osx/a11ywrapperbutton.h b/vcl/osx/a11ywrapperbutton.h
index 23103cd92b98..7105d160bf6c 100644
--- a/vcl/osx/a11ywrapperbutton.h
+++ b/vcl/osx/a11ywrapperbutton.h
@@ -25,9 +25,9 @@
@interface AquaA11yWrapperButton : AquaA11yWrapper
{
}
--(id)valueAttribute;
--(id)descriptionAttribute;
--(NSArray *)accessibilityAttributeNames;
+- (id)valueAttribute;
+- (id)descriptionAttribute;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERBUTTON_H
diff --git a/vcl/osx/a11ywrappercheckbox.h b/vcl/osx/a11ywrappercheckbox.h
index 6f20a888b271..80c37b1dcaad 100644
--- a/vcl/osx/a11ywrappercheckbox.h
+++ b/vcl/osx/a11ywrappercheckbox.h
@@ -25,9 +25,9 @@
@interface AquaA11yWrapperCheckBox : AquaA11yWrapper
{
}
--(id)valueAttribute;
--(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute;
--(NSArray *)accessibilityAttributeNames;
+- (id)valueAttribute;
+- (BOOL)accessibilityIsAttributeSettable:(NSString*)attribute;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERCHECKBOX_H
diff --git a/vcl/osx/a11ywrappercombobox.h b/vcl/osx/a11ywrappercombobox.h
index 7995f06b69fd..1df25fbbe184 100644
--- a/vcl/osx/a11ywrappercombobox.h
+++ b/vcl/osx/a11ywrappercombobox.h
@@ -25,18 +25,19 @@
@interface AquaA11yWrapperComboBox : AquaA11yWrapper
{
- AquaA11yWrapper * textArea;
+ AquaA11yWrapper* textArea;
}
--(id)initWithAccessibleContext: (css::uno::Reference <
css::accessibility::XAccessibleContext >) anAccessibleContext;
--(id)valueAttribute;
--(id)numberOfCharactersAttribute;
--(id)selectedTextAttribute;
--(id)selectedTextRangeAttribute;
--(id)visibleCharacterRangeAttribute;
+- (id)initWithAccessibleContext:
+
(css::uno::Reference<css::accessibility::XAccessibleContext>)anAccessibleContext;
+- (id)valueAttribute;
+- (id)numberOfCharactersAttribute;
+- (id)selectedTextAttribute;
+- (id)selectedTextRangeAttribute;
+- (id)visibleCharacterRangeAttribute;
// Accessibility Protocol
--(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute;
--(void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute;
--(NSArray *)accessibilityAttributeNames;
+- (BOOL)accessibilityIsAttributeSettable:(NSString*)attribute;
+- (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERCOMBOBOX_H
diff --git a/vcl/osx/a11ywrappergroup.h b/vcl/osx/a11ywrappergroup.h
index 5309c155b1c4..ece809a84d57 100644
--- a/vcl/osx/a11ywrappergroup.h
+++ b/vcl/osx/a11ywrappergroup.h
@@ -25,8 +25,8 @@
@interface AquaA11yWrapperGroup : AquaA11yWrapper
{
}
--(id)titleUIElementAttribute;
--(NSArray *)accessibilityAttributeNames;
+- (id)titleUIElementAttribute;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERGROUP_H
diff --git a/vcl/osx/a11ywrapperlist.h b/vcl/osx/a11ywrapperlist.h
index 8864555f283e..d13101c584aa 100644
--- a/vcl/osx/a11ywrapperlist.h
+++ b/vcl/osx/a11ywrapperlist.h
@@ -25,7 +25,7 @@
@interface AquaA11yWrapperList : AquaA11yWrapper
{
}
--(NSArray *)accessibilityAttributeNames;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERLIST_H
diff --git a/vcl/osx/a11ywrapperradiobutton.h b/vcl/osx/a11ywrapperradiobutton.h
index ec8999f36035..11f94b033cc9 100644
--- a/vcl/osx/a11ywrapperradiobutton.h
+++ b/vcl/osx/a11ywrapperradiobutton.h
@@ -25,9 +25,9 @@
@interface AquaA11yWrapperRadioButton : AquaA11yWrapper
{
}
--(id)valueAttribute;
--(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute;
--(NSArray *)accessibilityAttributeNames;
+- (id)valueAttribute;
+- (BOOL)accessibilityIsAttributeSettable:(NSString*)attribute;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERRADIOBUTTON_H
diff --git a/vcl/osx/a11ywrapperradiogroup.h b/vcl/osx/a11ywrapperradiogroup.h
index 98e5a5cf5789..6c576c866513 100644
--- a/vcl/osx/a11ywrapperradiogroup.h
+++ b/vcl/osx/a11ywrapperradiogroup.h
@@ -25,7 +25,7 @@
@interface AquaA11yWrapperRadioGroup : AquaA11yWrapper
{
}
--(NSArray *)accessibilityAttributeNames;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERRADIOGROUP_H
diff --git a/vcl/osx/a11ywrapperrow.h b/vcl/osx/a11ywrapperrow.h
index 00e32f4dfdb4..ebf6ae0bb5fa 100644
--- a/vcl/osx/a11ywrapperrow.h
+++ b/vcl/osx/a11ywrapperrow.h
@@ -25,8 +25,8 @@
@interface AquaA11yWrapperRow : AquaA11yWrapper
{
}
--(id)disclosingAttribute;
--(NSArray *)accessibilityAttributeNames;
+- (id)disclosingAttribute;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERROW_H
diff --git a/vcl/osx/a11ywrapperscrollarea.h b/vcl/osx/a11ywrapperscrollarea.h
index c1556f9a9c19..3eaf1dc42ad1 100644
--- a/vcl/osx/a11ywrapperscrollarea.h
+++ b/vcl/osx/a11ywrapperscrollarea.h
@@ -25,9 +25,9 @@
@interface AquaA11yWrapperScrollArea : AquaA11yWrapper
{
}
--(id)verticalScrollBarAttribute;
--(id)horizontalScrollBarAttribute;
--(NSArray *)accessibilityAttributeNames;
+- (id)verticalScrollBarAttribute;
+- (id)horizontalScrollBarAttribute;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERSCROLLAREA_H
diff --git a/vcl/osx/a11ywrapperscrollbar.h b/vcl/osx/a11ywrapperscrollbar.h
index 88beceb4f1cd..e05ab3cccaf4 100644
--- a/vcl/osx/a11ywrapperscrollbar.h
+++ b/vcl/osx/a11ywrapperscrollbar.h
@@ -25,7 +25,7 @@
@interface AquaA11yWrapperScrollBar : AquaA11yWrapper
{
}
--(NSArray *)accessibilityAttributeNames;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERSCROLLBAR_H
diff --git a/vcl/osx/a11ywrappersplitter.h b/vcl/osx/a11ywrappersplitter.h
index 22397e869488..60774c258622 100644
--- a/vcl/osx/a11ywrappersplitter.h
+++ b/vcl/osx/a11ywrappersplitter.h
@@ -25,7 +25,7 @@
@interface AquaA11yWrapperSplitter : AquaA11yWrapper
{
}
--(NSArray *)accessibilityAttributeNames;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERSPLITTER_H
diff --git a/vcl/osx/a11ywrapperstatictext.h b/vcl/osx/a11ywrapperstatictext.h
index c02a1f3b82a4..d3fcd3536d6c 100644
--- a/vcl/osx/a11ywrapperstatictext.h
+++ b/vcl/osx/a11ywrapperstatictext.h
@@ -25,8 +25,8 @@
@interface AquaA11yWrapperStaticText : AquaA11yWrapper
{
}
--(id)titleAttribute;
--(NSArray *)accessibilityAttributeNames;
+- (id)titleAttribute;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERSTATICTEXT_H
diff --git a/vcl/osx/a11ywrappertabgroup.h b/vcl/osx/a11ywrappertabgroup.h
index 38c12ed21afb..c38b1d34ac1c 100644
--- a/vcl/osx/a11ywrappertabgroup.h
+++ b/vcl/osx/a11ywrappertabgroup.h
@@ -25,7 +25,7 @@
@interface AquaA11yWrapperTabGroup : AquaA11yWrapper
{
}
--(NSArray *)accessibilityAttributeNames;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERTABGROUP_H
diff --git a/vcl/osx/a11ywrappertextarea.h b/vcl/osx/a11ywrappertextarea.h
index 325284973eac..f32862a769ce 100644
--- a/vcl/osx/a11ywrappertextarea.h
+++ b/vcl/osx/a11ywrappertextarea.h
@@ -25,7 +25,7 @@
@interface AquaA11yWrapperTextArea : AquaA11yWrapper
{
}
--(NSArray *)accessibilityAttributeNames;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERTEXTAREA_H
diff --git a/vcl/osx/a11ywrappertoolbar.h b/vcl/osx/a11ywrappertoolbar.h
index d8871a507879..2d61822900c5 100644
--- a/vcl/osx/a11ywrappertoolbar.h
+++ b/vcl/osx/a11ywrappertoolbar.h
@@ -25,7 +25,7 @@
@interface AquaA11yWrapperToolbar : AquaA11yWrapper
{
}
--(NSArray *)accessibilityAttributeNames;
+- (NSArray*)accessibilityAttributeNames;
@end
#endif // INCLUDED_VCL_OSX_A11YWRAPPERTOOLBAR_H
diff --git a/vcl/qa/cppunit/BitmapProcessorTest.cxx
b/vcl/qa/cppunit/BitmapProcessorTest.cxx
index 2a628285d0f2..e7793cf0a67f 100644
--- a/vcl/qa/cppunit/BitmapProcessorTest.cxx
+++ b/vcl/qa/cppunit/BitmapProcessorTest.cxx
@@ -21,7 +21,6 @@
namespace
{
-
class BitmapProcessorTest : public CppUnit::TestFixture
{
void testDisabledImage();
diff --git a/vcl/qa/cppunit/fontcharmap.cxx b/vcl/qa/cppunit/fontcharmap.cxx
index b9d0d8c2179f..26a2fe9a0a0d 100644
--- a/vcl/qa/cppunit/fontcharmap.cxx
+++ b/vcl/qa/cppunit/fontcharmap.cxx
@@ -14,7 +14,10 @@
class VclFontCharMapTest : public test::BootstrapFixture
{
public:
- VclFontCharMapTest() : BootstrapFixture(true, false) {}
+ VclFontCharMapTest()
+ : BootstrapFixture(true, false)
+ {
+ }
void testDefaultFontCharMap();
@@ -25,9 +28,9 @@ public:
void VclFontCharMapTest::testDefaultFontCharMap()
{
- FontCharMapRef xfcmap( new FontCharMap() ); // gets default map
+ FontCharMapRef xfcmap(new FontCharMap()); // gets default map
- CPPUNIT_ASSERT( xfcmap->IsDefaultMap() );
+ CPPUNIT_ASSERT(xfcmap->IsDefaultMap());
sal_uInt32 nStartBMPPlane = xfcmap->GetFirstChar();
sal_uInt32 nStartSupBMPPlane = xfcmap->GetNextChar(0xD800);
@@ -35,7 +38,7 @@ void VclFontCharMapTest::testDefaultFontCharMap()
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(0x0020), nStartBMPPlane);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(0xE000), nStartSupBMPPlane);
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(0xFFF0-1), nEndBMPPlane);
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(0xFFF0 - 1), nEndBMPPlane);
}
CPPUNIT_TEST_SUITE_REGISTRATION(VclFontCharMapTest);
diff --git a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
index 3dd113a5ccd2..78124beef5f3 100644
--- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
+++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx
@@ -38,24 +38,25 @@ public:
static int deltaColor(BitmapColor aColor1, BitmapColor aColor2)
{
- int deltaR = std::abs(aColor1.GetRed() - aColor2.GetRed());
+ int deltaR = std::abs(aColor1.GetRed() - aColor2.GetRed());
int deltaG = std::abs(aColor1.GetGreen() - aColor2.GetGreen());
- int deltaB = std::abs(aColor1.GetBlue() - aColor2.GetBlue());
+ int deltaB = std::abs(aColor1.GetBlue() - aColor2.GetBlue());
return std::max(std::max(deltaR, deltaG), deltaB);
}
-static bool checkRect(Bitmap& rBitmap, int aLayerNumber, tools::Long
nAreaHeight, tools::Long nAreaWidth, Color aExpectedColor, int nMaxDelta)
+static bool checkRect(Bitmap& rBitmap, int aLayerNumber, tools::Long
nAreaHeight,
+ tools::Long nAreaWidth, Color aExpectedColor, int
nMaxDelta)
{
BitmapScopedWriteAccess pAccess(rBitmap);
- tools::Long nWidth = std::min(nAreaWidth, pAccess->Width());
+ tools::Long nWidth = std::min(nAreaWidth, pAccess->Width());
tools::Long nHeight = std::min(nAreaHeight, pAccess->Height());
tools::Long firstX = 0 + aLayerNumber;
tools::Long firstY = 0 + aLayerNumber;
- tools::Long lastX = nWidth - 1 - aLayerNumber;
+ tools::Long lastX = nWidth - 1 - aLayerNumber;
tools::Long lastY = nHeight - 1 - aLayerNumber;
int delta;
@@ -79,7 +80,7 @@ static bool checkRect(Bitmap& rBitmap, int aLayerNumber,
tools::Long nAreaHeight
if (delta > nMaxDelta)
return false;
- Color aColorLast = pAccess->GetPixel(lastY, x);
+ Color aColorLast = pAccess->GetPixel(lastY, x);
delta = deltaColor(aColorLast, aExpectedColor);
if (delta > nMaxDelta)
return false;
@@ -132,7 +133,8 @@ void JpegReaderTest::testReadGray()
CPPUNIT_ASSERT_EQUAL(tools::Long(12), aSize.Width());
CPPUNIT_ASSERT_EQUAL(tools::Long(12), aSize.Height());
- aBitmap.Convert(BmpConversion::N24Bit); // convert to 24bit so we don't
need to deal with palette
+ aBitmap.Convert(
+ BmpConversion::N24Bit); // convert to 24bit so we don't need to deal
with palette
int nMaxDelta = 1;
CPPUNIT_ASSERT(checkRect(aBitmap, 0, 8, 8, Color(0xff, 0xff, 0xff),
nMaxDelta));
diff --git a/vcl/qa/cppunit/mnemonic.cxx b/vcl/qa/cppunit/mnemonic.cxx
index e870e1d29c98..59456503b54f 100644
--- a/vcl/qa/cppunit/mnemonic.cxx
+++ b/vcl/qa/cppunit/mnemonic.cxx
@@ -18,7 +18,10 @@
class VclMnemonicTest : public test::BootstrapFixture
{
public:
- VclMnemonicTest() : BootstrapFixture(true, false) {}
+ VclMnemonicTest()
+ : BootstrapFixture(true, false)
+ {
+ }
void testMnemonic();
@@ -47,7 +50,6 @@ void VclMnemonicTest::testMnemonic()
OUString sResult = aGenerator.CreateMnemonic(OUString(TEST,
SAL_N_ELEMENTS(TEST)));
CPPUNIT_ASSERT_EQUAL(OUString("(~C)"),
sResult.copy(sResult.getLength() - 4));
}
-
}
CPPUNIT_TEST_SUITE_REGISTRATION(VclMnemonicTest);
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index e99a35f67adf..97ec62096ce9 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -24,7 +24,10 @@
class VclOutdevTest : public test::BootstrapFixture
{
public:
- VclOutdevTest() : BootstrapFixture(true, false) {}
+ VclOutdevTest()
+ : BootstrapFixture(true, false)
+ {
+ }
void testVirtualDevice();
void testUseAfterDispose();
@@ -80,20 +83,20 @@ void VclOutdevTest::testWindowBackgroundColor()
void VclOutdevTest::testVirtualDevice()
{
- ScopedVclPtrInstance< VirtualDevice > pVDev;
- pVDev->SetOutputSizePixel(Size(32,32));
+ ScopedVclPtrInstance<VirtualDevice> pVDev;
+ pVDev->SetOutputSizePixel(Size(32, 32));
pVDev->SetBackground(Wallpaper(COL_WHITE));
CPPUNIT_ASSERT_EQUAL(pVDev->GetBackgroundColor(), COL_WHITE);
pVDev->Erase();
- pVDev->DrawPixel(Point(1,2),COL_BLUE);
- pVDev->DrawPixel(Point(31,30),COL_RED);
+ pVDev->DrawPixel(Point(1, 2), COL_BLUE);
+ pVDev->DrawPixel(Point(31, 30), COL_RED);
Size aSize = pVDev->GetOutputSizePixel();
- CPPUNIT_ASSERT_EQUAL(Size(32,32), aSize);
+ CPPUNIT_ASSERT_EQUAL(Size(32, 32), aSize);
- Bitmap aBmp = pVDev->GetBitmap(Point(),aSize);
+ Bitmap aBmp = pVDev->GetBitmap(Point(), aSize);
#if 0
OUString rFileName("/tmp/foo-unx.png");
@@ -107,21 +110,21 @@ void VclOutdevTest::testVirtualDevice()
}
#endif
- CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(0,0)));
+ CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(0, 0)));
#if !defined _WIN32 //TODO: various failures on Windows tinderboxes
- CPPUNIT_ASSERT_EQUAL(COL_BLUE, pVDev->GetPixel(Point(1,2)));
- CPPUNIT_ASSERT_EQUAL(COL_RED, pVDev->GetPixel(Point(31,30)));
+ CPPUNIT_ASSERT_EQUAL(COL_BLUE, pVDev->GetPixel(Point(1, 2)));
+ CPPUNIT_ASSERT_EQUAL(COL_RED, pVDev->GetPixel(Point(31, 30)));
#endif
- CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(30,31)));
+ CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(30, 31)));
// Gotcha: y and x swap for BitmapReadAccess: deep joy.
Bitmap::ScopedReadAccess pAcc(aBmp);
- CPPUNIT_ASSERT_EQUAL(COL_WHITE, static_cast<Color>(pAcc->GetPixel(0,0)));
+ CPPUNIT_ASSERT_EQUAL(COL_WHITE, static_cast<Color>(pAcc->GetPixel(0, 0)));
#if !defined _WIN32 //TODO: various failures on Windows tinderboxes
- CPPUNIT_ASSERT_EQUAL(COL_BLUE, static_cast<Color>(pAcc->GetPixel(2,1)));
- CPPUNIT_ASSERT_EQUAL(COL_RED, static_cast<Color>(pAcc->GetPixel(30,31)));
+ CPPUNIT_ASSERT_EQUAL(COL_BLUE, static_cast<Color>(pAcc->GetPixel(2, 1)));
+ CPPUNIT_ASSERT_EQUAL(COL_RED, static_cast<Color>(pAcc->GetPixel(30, 31)));
#endif
- CPPUNIT_ASSERT_EQUAL(COL_WHITE, static_cast<Color>(pAcc->GetPixel(31,30)));
+ CPPUNIT_ASSERT_EQUAL(COL_WHITE, static_cast<Color>(pAcc->GetPixel(31,
30)));
#if 0
VclPtr<vcl::Window> pWin = VclPtr<WorkWindow>::Create( (vcl::Window
*)nullptr );
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index c99f12cafd07..92d5bcb22bd0 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -59,7 +59,6 @@ static std::ostream& operator<<(std::ostream& rStrm, const
Color& rColor)
namespace
{
-
/// Tests the PDF export filter.
class PdfExportTest : public test::BootstrapFixture, public unotest::MacrosTest
{
@@ -68,7 +67,8 @@ protected:
utl::TempFile maTempFile;
SvMemoryStream maMemory;
// Export the document as PDF, then parse it with PDFium.
- std::unique_ptr<vcl::pdf::PDFiumDocument> exportAndParse(const OUString&
rURL, const utl::MediaDescriptor& rDescriptor);
+ std::unique_ptr<vcl::pdf::PDFiumDocument>
+ exportAndParse(const OUString& rURL, const utl::MediaDescriptor&
rDescriptor);
std::shared_ptr<vcl::pdf::PDFium> mpPDFium;
public:
@@ -79,12 +79,10 @@ public:
void load(const OUString& rFile, vcl::filter::PDFDocument& rDocument);
};
-PdfExportTest::PdfExportTest()
-{
- maTempFile.EnableKillingFile();
-}
+PdfExportTest::PdfExportTest() { maTempFile.EnableKillingFile(); }
-std::unique_ptr<vcl::pdf::PDFiumDocument> PdfExportTest::exportAndParse(const
OUString& rURL, const utl::MediaDescriptor& rDescriptor)
+std::unique_ptr<vcl::pdf::PDFiumDocument>
+PdfExportTest::exportAndParse(const OUString& rURL, const
utl::MediaDescriptor& rDescriptor)
{
// Import the bugdoc and export as PDF.
mxComponent = loadFromDesktop(rURL);
@@ -156,9 +154,8 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf106059)
utl::MediaDescriptor aMediaDescriptor;
aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
// Explicitly enable the usage of the reference XObject markup.
- uno::Sequence<beans::PropertyValue> aFilterData(
comphelper::InitPropertySequence({
- {"UseReferenceXObject", uno::Any(true) }
- }));
+ uno::Sequence<beans::PropertyValue> aFilterData(
+ comphelper::InitPropertySequence({ { "UseReferenceXObject",
uno::Any(true) } }));
aMediaDescriptor["FilterData"] <<= aFilterData;
xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
@@ -173,11 +170,13 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf106059)
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aPages.size());
vcl::filter::PDFObjectElement* pResources =
aPages[0]->LookupObject("Resources");
CPPUNIT_ASSERT(pResources);
- auto pXObjects =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pResources->Lookup("XObject"));
+ auto pXObjects
+ =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pResources->Lookup("XObject"));
CPPUNIT_ASSERT(pXObjects);
// The page has one image.
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pXObjects->GetItems().size());
- vcl::filter::PDFObjectElement* pReferenceXObject =
pXObjects->LookupObject(pXObjects->GetItems().begin()->first);
+ vcl::filter::PDFObjectElement* pReferenceXObject
+ = pXObjects->LookupObject(pXObjects->GetItems().begin()->first);
CPPUNIT_ASSERT(pReferenceXObject);
// The image is a reference XObject.
// This dictionary key was missing, so the XObject wasn't a reference one.
@@ -196,11 +195,13 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf106693)
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), aPages.size());
vcl::filter::PDFObjectElement* pResources =
aPages[0]->LookupObject("Resources");
CPPUNIT_ASSERT(pResources);
- auto pXObjects =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pResources->Lookup("XObject"));
+ auto pXObjects
+ =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pResources->Lookup("XObject"));
CPPUNIT_ASSERT(pXObjects);
// The page has one image.
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pXObjects->GetItems().size());
- vcl::filter::PDFObjectElement* pXObject =
pXObjects->LookupObject(pXObjects->GetItems().begin()->first);
+ vcl::filter::PDFObjectElement* pXObject
+ = pXObjects->LookupObject(pXObjects->GetItems().begin()->first);
CPPUNIT_ASSERT(pXObject);
// The image is a form XObject.
auto pSubtype =
dynamic_cast<vcl::filter::PDFNameElement*>(pXObject->Lookup("Subtype"));
@@ -211,14 +212,18 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf106693)
// Assert that the form object refers to an inner form object, not a
// bitmap.
- auto pInnerResources =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pXObject->Lookup("Resources"));
+ auto pInnerResources
+ =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pXObject->Lookup("Resources"));
CPPUNIT_ASSERT(pInnerResources);
- auto pInnerXObjects =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pInnerResources->LookupElement("XObject"));
+ auto pInnerXObjects = dynamic_cast<vcl::filter::PDFDictionaryElement*>(
+ pInnerResources->LookupElement("XObject"));
CPPUNIT_ASSERT(pInnerXObjects);
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1),
pInnerXObjects->GetItems().size());
- vcl::filter::PDFObjectElement* pInnerXObject =
pInnerXObjects->LookupObject(pInnerXObjects->GetItems().begin()->first);
+ vcl::filter::PDFObjectElement* pInnerXObject
+ =
pInnerXObjects->LookupObject(pInnerXObjects->GetItems().begin()->first);
CPPUNIT_ASSERT(pInnerXObject);
- auto pInnerSubtype =
dynamic_cast<vcl::filter::PDFNameElement*>(pInnerXObject->Lookup("Subtype"));
+ auto pInnerSubtype
+ =
dynamic_cast<vcl::filter::PDFNameElement*>(pInnerXObject->Lookup("Subtype"));
CPPUNIT_ASSERT(pInnerSubtype);
// This failed: this was Image (bitmap), not Form (vector).
CPPUNIT_ASSERT_EQUAL(OString("Form"), pInnerSubtype->GetValue());
@@ -270,8 +275,8 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105461)
CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf107868)
{
- // No need to run it on Windows, since it would use GDI printing, and not
trigger PDF export
- // which is the intent of the test.
+// No need to run it on Windows, since it would use GDI printing, and not
trigger PDF export
+// which is the intent of the test.
// FIXME: Why does this fail on macOS?
#if !defined MACOSX && !defined _WIN32
@@ -284,10 +289,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf107868)
uno::Reference<view::XPrintable> xPrintable(mxComponent, uno::UNO_QUERY);
CPPUNIT_ASSERT(xPrintable.is());
uno::Sequence<beans::PropertyValue>
aOptions(comphelper::InitPropertySequence(
- {
- {"FileName", uno::makeAny(maTempFile.GetURL())},
- {"Wait", uno::makeAny(true)}
- }));
+ { { "FileName", uno::makeAny(maTempFile.GetURL()) }, { "Wait",
uno::makeAny(true) } }));
xPrintable->print(aOptions);
// Parse the export result with pdfium.
@@ -339,20 +341,25 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf105093)
auto pAnnots =
dynamic_cast<vcl::filter::PDFArrayElement*>(aPages[0]->Lookup("Annots"));
CPPUNIT_ASSERT(pAnnots);
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1),
pAnnots->GetElements().size());
- auto pAnnotReference =
dynamic_cast<vcl::filter::PDFReferenceElement*>(pAnnots->GetElements()[0]);
+ auto pAnnotReference
+ =
dynamic_cast<vcl::filter::PDFReferenceElement*>(pAnnots->GetElements()[0]);
CPPUNIT_ASSERT(pAnnotReference);
vcl::filter::PDFObjectElement* pAnnot = pAnnotReference->LookupObject();
CPPUNIT_ASSERT(pAnnot);
- CPPUNIT_ASSERT_EQUAL(OString("Annot"),
static_cast<vcl::filter::PDFNameElement*>(pAnnot->Lookup("Type"))->GetValue());
+ CPPUNIT_ASSERT_EQUAL(
+ OString("Annot"),
+
static_cast<vcl::filter::PDFNameElement*>(pAnnot->Lookup("Type"))->GetValue());
// Get the Action -> Rendition -> MediaClip -> FileSpec.
auto pAction =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pAnnot->Lookup("A"));
CPPUNIT_ASSERT(pAction);
auto pRendition =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pAction->LookupElement("R"));
CPPUNIT_ASSERT(pRendition);
- auto pMediaClip =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pRendition->LookupElement("C"));
+ auto pMediaClip
+ =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pRendition->LookupElement("C"));
CPPUNIT_ASSERT(pMediaClip);
- auto pFileSpec =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pMediaClip->LookupElement("D"));
+ auto pFileSpec
+ =
dynamic_cast<vcl::filter::PDFDictionaryElement*>(pMediaClip->LookupElement("D"));
CPPUNIT_ASSERT(pFileSpec);
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
