From 431431b97352894425484e576dc0b5b6ddfe3ee3 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sat, 6 Feb 2016 21:03:41 +1100 Subject: vcl: bmpacc.hxx -> bitmapaccess.hxx (cherry picked from commit 88730cdae3520b18fc073dc59bd0ed660e15d6b4) Change-Id: I4bb19d6103c4a6a902d86b62a857e3478493924c --- avmedia/source/gstreamer/gstframegrabber.cxx | 2 +- avmedia/source/opengl/oglframegrabber.cxx | 2 +- avmedia/source/vlc/vlcframegrabber.cxx | 2 +- canvas/source/cairo/cairo_canvasbitmap.cxx | 2 +- canvas/source/cairo/cairo_canvashelper.cxx | 2 +- canvas/source/directx/dx_vcltools.cxx | 2 +- canvas/source/vcl/bitmapbackbuffer.cxx | 2 +- canvas/source/vcl/canvasbitmap.cxx | 2 +- canvas/source/vcl/canvasbitmaphelper.cxx | 2 +- canvas/source/vcl/canvashelper.cxx | 2 +- canvas/source/vcl/canvashelper_texturefill.cxx | 2 +- canvas/source/vcl/impltools.cxx | 2 +- chart2/source/view/main/3DChartObjects.cxx | 2 +- cppcanvas/qa/extras/emfplus/emfplus.cxx | 2 +- cui/source/dialogs/colorpicker.cxx | 2 +- cui/source/tabpages/tpbitmap.cxx | 2 +- .../source/primitive3d/sdrdecompositiontools3d.cxx | 2 +- .../source/processor3d/zbufferprocessor3d.cxx | 2 +- drawinglayer/source/texture/texture3d.cxx | 2 +- filter/source/flash/swfwriter1.cxx | 2 +- filter/source/graphicfilter/egif/giflzwc.hxx | 2 +- filter/source/graphicfilter/epbm/epbm.cxx | 2 +- filter/source/graphicfilter/epgm/epgm.cxx | 2 +- filter/source/graphicfilter/epict/epict.cxx | 2 +- filter/source/graphicfilter/eppm/eppm.cxx | 2 +- filter/source/graphicfilter/eps/eps.cxx | 2 +- filter/source/graphicfilter/eras/eras.cxx | 2 +- filter/source/graphicfilter/etiff/etiff.cxx | 2 +- filter/source/graphicfilter/expm/expm.cxx | 2 +- filter/source/graphicfilter/icgm/bitmap.hxx | 2 +- filter/source/graphicfilter/ieps/ieps.cxx | 2 +- filter/source/graphicfilter/ipbm/ipbm.cxx | 2 +- filter/source/graphicfilter/ipcd/ipcd.cxx | 2 +- filter/source/graphicfilter/ipcx/ipcx.cxx | 2 +- filter/source/graphicfilter/ipict/ipict.cxx | 2 +- filter/source/graphicfilter/ipsd/ipsd.cxx | 2 +- filter/source/graphicfilter/iras/iras.cxx | 2 +- filter/source/graphicfilter/itga/itga.cxx | 2 +- filter/source/graphicfilter/itiff/itiff.cxx | 2 +- filter/source/msfilter/msdffimp.cxx | 2 +- filter/source/msfilter/svdfppt.cxx | 2 +- filter/source/pdf/pdfexport.cxx | 2 +- forms/source/component/imgprod.cxx | 2 +- include/vcl/bitmapaccess.hxx | 432 +++++++++++++++++++++ include/vcl/bmpacc.hxx | 432 --------------------- lotuswordpro/source/filter/lwpbackgroundstuff.cxx | 2 +- reportdesign/source/ui/dlg/Condition.cxx | 2 +- sc/source/filter/excel/excimp8.cxx | 2 +- sc/source/filter/excel/xeescher.cxx | 2 +- sc/source/ui/sidebar/CellBorderUpdater.cxx | 2 +- sd/inc/pch/precompiled_sd.hxx | 2 +- sd/qa/unit/import-tests.cxx | 2 +- sd/source/filter/eppt/eppt.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 2 +- sd/source/filter/eppt/pptx-epptbase.cxx | 2 +- sd/source/filter/html/htmlex.cxx | 2 +- sd/source/filter/ppt/pptin.cxx | 2 +- sd/source/ui/dlg/vectdlg.cxx | 2 +- .../ui/slidesorter/cache/SlsBitmapFactory.cxx | 2 +- sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 2 +- sd/source/ui/table/TableDesignPane.cxx | 2 +- svtools/source/graphic/grfmgr2.cxx | 2 +- svtools/source/graphic/transformer.cxx | 2 +- svx/inc/pch/precompiled_svxcore.hxx | 2 +- svx/source/dialog/dlgctrl.cxx | 2 +- svx/source/sdr/primitive2d/sdrprimitivetools.cxx | 2 +- svx/source/svdraw/svdetc.cxx | 2 +- svx/source/svdraw/svdfmtf.cxx | 2 +- svx/source/svdraw/svdhdl.cxx | 2 +- svx/source/svdraw/svdoashp.cxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 2 +- svx/source/tbxctrls/tbxcolorupdate.cxx | 2 +- svx/source/xoutdev/_xoutbmp.cxx | 2 +- svx/source/xoutdev/xattrbmp.cxx | 2 +- sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 +- sw/source/core/view/viewsh.cxx | 2 +- vcl/generic/print/genpspgraphics.cxx | 2 +- vcl/inc/BitmapSymmetryCheck.hxx | 2 +- vcl/inc/canvasbitmap.hxx | 2 +- vcl/inc/pch/precompiled_vcl.hxx | 2 +- vcl/qa/cppunit/BitmapFilterTest.cxx | 2 +- vcl/qa/cppunit/BitmapTest.cxx | 2 +- vcl/qa/cppunit/canvasbitmaptest.cxx | 2 +- vcl/qa/cppunit/outdev.cxx | 2 +- vcl/source/bitmap/BitmapFilterStackBlur.cxx | 2 +- vcl/source/bitmap/BitmapProcessor.cxx | 2 +- vcl/source/bitmap/BitmapScaleConvolution.cxx | 2 +- vcl/source/bitmap/bitmapscalesuper.cxx | 2 +- vcl/source/filter/igif/decode.hxx | 2 +- vcl/source/filter/igif/gifread.hxx | 2 +- vcl/source/filter/ixbm/xbmread.hxx | 2 +- vcl/source/filter/ixpm/xpmread.cxx | 2 +- vcl/source/filter/jpeg/JpegReader.cxx | 2 +- vcl/source/filter/jpeg/JpegWriter.cxx | 2 +- vcl/source/filter/jpeg/jpeg.cxx | 2 +- vcl/source/filter/wmf/winmtf.hxx | 2 +- vcl/source/gdi/alpha.cxx | 2 +- vcl/source/gdi/bitmap.cxx | 2 +- vcl/source/gdi/bitmap3.cxx | 2 +- vcl/source/gdi/bitmap4.cxx | 2 +- vcl/source/gdi/bitmapex.cxx | 2 +- vcl/source/gdi/bmpacc.cxx | 2 +- vcl/source/gdi/bmpacc2.cxx | 2 +- vcl/source/gdi/bmpacc3.cxx | 2 +- vcl/source/gdi/bmpfast.cxx | 2 +- vcl/source/gdi/dibtools.cxx | 2 +- vcl/source/gdi/impvect.cxx | 2 +- vcl/source/gdi/octree.cxx | 2 +- vcl/source/gdi/pdfwriter_impl.cxx | 2 +- vcl/source/gdi/pdfwriter_impl2.cxx | 2 +- vcl/source/gdi/pngread.cxx | 2 +- vcl/source/gdi/pngwrite.cxx | 2 +- vcl/source/gdi/print2.cxx | 2 +- vcl/source/gdi/salmisc.cxx | 2 +- vcl/source/helper/canvasbitmap.cxx | 2 +- vcl/source/helper/canvastools.cxx | 2 +- vcl/source/image/ImageArrayData.cxx | 2 +- vcl/source/image/ImplImage.cxx | 2 +- vcl/source/image/ImplImageList.cxx | 2 +- vcl/source/opengl/OpenGLContext.cxx | 2 +- vcl/source/opengl/OpenGLHelper.cxx | 2 +- vcl/source/outdev/bitmap.cxx | 2 +- vcl/source/outdev/text.cxx | 2 +- vcl/source/outdev/transparent.cxx | 2 +- vcl/unx/generic/gdi/salgdi2.cxx | 2 +- vcl/unx/generic/window/salframe.cxx | 2 +- vcl/win/source/gdi/salgdi2.cxx | 2 +- vcl/workben/svptest.cxx | 2 +- vcl/workben/vcldemo.cxx | 2 +- 129 files changed, 559 insertions(+), 559 deletions(-) create mode 100644 include/vcl/bitmapaccess.hxx delete mode 100644 include/vcl/bmpacc.hxx diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 7904885fc149..6f2f7c0a3c1b 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx index a720c8eeafd7..6b38dd0b13ab 100644 --- a/avmedia/source/opengl/oglframegrabber.cxx +++ b/avmedia/source/opengl/oglframegrabber.cxx @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index 5ee29fbbe15f..0077466d40aa 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 947d1857c16c..2e5f88626040 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index af94c38d2259..c42e85f8d76d 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx index 38462b4690cd..3b032cfd06ca 100644 --- a/canvas/source/directx/dx_vcltools.cxx +++ b/canvas/source/directx/dx_vcltools.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include "dx_impltools.hxx" diff --git a/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx index c746b189b433..96404f46d74f 100644 --- a/canvas/source/vcl/bitmapbackbuffer.cxx +++ b/canvas/source/vcl/bitmapbackbuffer.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include "bitmapbackbuffer.hxx" diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index a254f00f99a4..562e8a46196b 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include "canvasbitmap.hxx" diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index 28ab1aaf93b0..6f5340f74127 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 97f9e7656a4e..f7fec84338cf 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index 8f85a4f5b797..34ca3ec03336 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index be277286fafc..51e5b64c051d 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx index e8bb046add59..7e367a961d94 100644 --- a/chart2/source/view/main/3DChartObjects.cxx +++ b/chart2/source/view/main/3DChartObjects.cxx @@ -13,7 +13,7 @@ #include #include -#include +#include namespace chart { diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx index f2a41cf57812..5eeb5f34d7c3 100644 --- a/cppcanvas/qa/extras/emfplus/emfplus.cxx +++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include using namespace com::sun::star; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index afcb033cfba2..f17c543c0f00 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 335b03a50575..0733247fc1af 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -28,7 +28,7 @@ #include #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #include -#include +#include #include #include diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx index 1d152a254a52..2049b3a4e9bd 100644 --- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx index f29a04b19c50..0334c911ba76 100644 --- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx +++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index fbeecaef3417..70939b8ec6a1 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include #include diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 8249bf42e76d..93dfe76f645b 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -24,7 +24,7 @@ #include "swfwriter.hxx" #include #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/egif/giflzwc.hxx b/filter/source/graphicfilter/egif/giflzwc.hxx index 6159e55673d1..bfe9784803d3 100644 --- a/filter/source/graphicfilter/egif/giflzwc.hxx +++ b/filter/source/graphicfilter/egif/giflzwc.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_EGIF_GIFLZWC_HXX -#include +#include // - GIFLZWCompressor - diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 1878cdad7345..6b40bfc9df76 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 28e231fdd9d7..e0bca4b02ca6 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index edf5d060fb6e..ab5640154eb3 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index cae8ea800dfd..564c7460a4a7 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 258463984c45..e3fc46a464f5 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index 0d9f0a774b85..ea9afb592684 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -19,7 +19,7 @@ #include -#include +#include #include #include diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index e793d3139966..ec7276cf835e 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 734bc1907ad6..f379e77b4b61 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -19,7 +19,7 @@ #include -#include +#include #include //============================ XPMWriter ================================== diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx index 96639d12ebcd..6614a0e571a4 100644 --- a/filter/source/graphicfilter/icgm/bitmap.hxx +++ b/filter/source/graphicfilter/icgm/bitmap.hxx @@ -21,7 +21,7 @@ #define INCLUDED_FILTER_SOURCE_GRAPHICFILTER_ICGM_BITMAP_HXX #include "cgm.hxx" -#include +#include class CGM; diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 9be5d83b5587..6e60107d5e32 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 939e64af3466..b54a1f74ad04 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include //============================ PBMReader ================================== diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index fd2418451a7b..4e759d9154e3 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -20,7 +20,7 @@ #include "rtl/alloc.h" #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index 47a72b4eb202..fd786dceacd4 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -19,7 +19,7 @@ #include -#include +#include class FilterConfigItem; diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 34281bd8e1df..2dd69fa7f8c5 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index f0993c3e7a23..d6213de3be19 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -19,7 +19,7 @@ #include -#include +#include #include #include #include diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 25da8fe7735f..204407de2bd7 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -19,7 +19,7 @@ #include -#include +#include class FilterConfigItem; diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index eb82cbf49e51..7d5827dc466f 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -19,7 +19,7 @@ #include -#include +#include class FilterConfigItem; diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 0afbaaff4f19..aae8b86f4de0 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include "lzwdecom.hxx" diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index ca6e6f2a2036..aadcd588eb1b 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -63,7 +63,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 9fda08ea16ff..74268e99bd25 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -80,7 +80,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index a55bdc943b78..9027c7351208 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -31,7 +31,7 @@ #include "vcl/metaact.hxx" #include "vcl/gdimtf.hxx" #include "vcl/jobset.hxx" -#include "vcl/bmpacc.hxx" +#include "vcl/bitmapaccess.hxx" #include "vcl/svapp.hxx" #include "toolkit/awt/vclxdevice.hxx" #include diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index 6fce82364851..0c66a21d1c96 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -20,7 +20,7 @@ #include "imgprod.hxx" #include "services.hxx" -#include +#include #include #include #include diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx new file mode 100644 index 000000000000..e2efa9150e39 --- /dev/null +++ b/include/vcl/bitmapaccess.hxx @@ -0,0 +1,432 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_VCL_BMPACC_HXX +#define INCLUDED_VCL_BMPACC_HXX + +#include +#include +#include +#include + +// - Access functions - +typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, long nX, const ColorMask& rMask); +typedef void (*FncSetPixel)(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + +// - BitmapInfoAccess - +class VCL_DLLPUBLIC BitmapInfoAccess +{ + friend class BitmapReadAccess; + +public: + BitmapInfoAccess(Bitmap& rBitmap); + virtual ~BitmapInfoAccess(); + + inline bool operator!() const; + + inline long Width() const; + inline long Height() const; + + inline bool IsTopDown() const; + inline bool IsBottomUp() const; + + inline sal_uLong GetScanlineFormat() const; + inline sal_uLong GetScanlineSize() const; + + inline sal_uInt16 GetBitCount() const; + inline BitmapColor GetBestMatchingColor(const BitmapColor& rBitmapColor); + + inline bool HasPalette() const; + inline const BitmapPalette& GetPalette() const; + inline sal_uInt16 GetPaletteEntryCount() const; + inline const BitmapColor& GetPaletteColor(sal_uInt16 nColor) const; + inline const BitmapColor& GetBestPaletteColor(const BitmapColor& rBitmapColor) const; + sal_uInt16 GetBestPaletteIndex(const BitmapColor& rBitmapColor) const; + + inline ColorMask& GetColorMask() const; + +private: + BitmapInfoAccess() + {} + + BitmapInfoAccess(const BitmapInfoAccess&) + {} + + BitmapInfoAccess& operator=(const BitmapInfoAccess&) + { + return *this; + } + +protected: + Bitmap maBitmap; + BitmapBuffer* mpBuffer; + ColorMask maColorMask; + BitmapAccessMode mnAccessMode; + + SAL_DLLPRIVATE void ImplCreate(Bitmap& rBitmap); + SAL_DLLPRIVATE void ImplDestroy(); + +protected: + BitmapInfoAccess(Bitmap& rBitmap, BitmapAccessMode nMode); +}; + +// - BitmapReadAccess - +class VCL_DLLPUBLIC BitmapReadAccess : public BitmapInfoAccess +{ + friend class BitmapWriteAccess; + +public: + BitmapReadAccess(Bitmap& rBitmap); + virtual ~BitmapReadAccess(); + + inline Scanline GetBuffer() const; + inline Scanline GetScanline( long nY ) const; + + inline BitmapColor GetPixelFromData( const sal_uInt8* pData, long nX ) const; + inline void SetPixelOnData( sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor ); + + inline BitmapColor GetPixel( long nY, long nX ) const; + inline BitmapColor GetColor( long nY, long nX ) const; + inline sal_uInt8 GetPixelIndex( long nY, long nX ) const; + inline sal_uInt8 GetLuminance( long nY, long nX ) const; + + /** Get the interpolated color at coordinates fY, fX; if outside, return rFallback */ + BitmapColor GetInterpolatedColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; + + /** Get the color at coordinates fY, fX; if outside, return rFallback. Automatically does the correct + inside/outside checks, e.g. static_cast< sal_uInt32 >(-0.25) *is* 0, not -1 and has to be outside */ + BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; + +private: + + BitmapReadAccess() + {} + + BitmapReadAccess(const BitmapReadAccess&) + : BitmapInfoAccess() + {} + + BitmapReadAccess& operator=(const BitmapReadAccess&) + { + return *this; + } + +protected: + Scanline* mpScanBuf; + FncGetPixel mFncGetPixel; + FncSetPixel mFncSetPixel; + + SAL_DLLPRIVATE void ImplInitScanBuffer( Bitmap& rBitmap ); + SAL_DLLPRIVATE void ImplClearScanBuffer(); + SAL_DLLPRIVATE bool ImplSetAccessPointers( sal_uLong nFormat ); + +public: + + SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const + { + return mpBuffer; + } + + static BitmapColor GetPixelFor_1BIT_MSB_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_1BIT_LSB_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_4BIT_MSN_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_4BIT_LSN_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_8BIT_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_8BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_16BIT_TC_MSB_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_16BIT_TC_LSB_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_24BIT_TC_BGR(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_24BIT_TC_RGB(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_24BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_32BIT_TC_ABGR(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_32BIT_TC_ARGB(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_32BIT_TC_BGRA(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_32BIT_TC_RGBA(ConstScanline pScanline, long nX, const ColorMask& rMask); + static BitmapColor GetPixelFor_32BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); + + static void SetPixelFor_1BIT_MSB_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_1BIT_LSB_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_4BIT_MSN_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_4BIT_LSN_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_8BIT_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_8BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_16BIT_TC_MSB_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_16BIT_TC_LSB_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_24BIT_TC_BGR(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_24BIT_TC_RGB(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_24BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_32BIT_TC_ABGR(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_32BIT_TC_ARGB(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_32BIT_TC_BGRA(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_32BIT_TC_RGBA(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + static void SetPixelFor_32BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); + +protected: + BitmapReadAccess(Bitmap& rBitmap, BitmapAccessMode nMode); +}; + +// - BitmapWriteAccess - +class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess +{ +public: + BitmapWriteAccess(Bitmap& rBitmap); + virtual ~BitmapWriteAccess(); + + void CopyScanline(long nY, const BitmapReadAccess& rReadAcc); + void CopyScanline(long nY, + ConstScanline aSrcScanline, + sal_uLong nSrcScanlineFormat, + sal_uLong nSrcScanlineSize); + + void CopyBuffer( const BitmapReadAccess& rReadAcc ); + + inline void SetPalette(const BitmapPalette& rPalette); + inline void SetPaletteEntryCount(sal_uInt16 nCount); + inline void SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor); + + inline void SetPixel(long nY, long nX, const BitmapColor& rBitmapColor); + inline void SetPixelIndex(long nY, long nX, sal_uInt8 cIndex); + + void SetLineColor(const Color& rColor); + + void SetFillColor(); + void SetFillColor(const Color& rColor); + + void Erase(const Color& rColor); + + void DrawLine(const Point& rStart, const Point& rEnd); + + void FillRect(const Rectangle& rRect); + void DrawRect(const Rectangle& rRect); + +private: + + std::unique_ptr mpLineColor; + std::unique_ptr mpFillColor; + + BitmapWriteAccess() + {} + + BitmapWriteAccess(const BitmapWriteAccess&) + : BitmapReadAccess() + {} + + BitmapWriteAccess& operator=(const BitmapWriteAccess&) + { + return *this; + } +}; + +// - Inlines - +inline bool BitmapInfoAccess::operator!() const +{ + return mpBuffer == nullptr; +} + +inline long BitmapInfoAccess::Width() const +{ + return mpBuffer ? mpBuffer->mnWidth : 0L; +} + +inline long BitmapInfoAccess::Height() const +{ + return mpBuffer ? mpBuffer->mnHeight : 0L; +} + +inline bool BitmapInfoAccess::IsTopDown() const +{ + assert(mpBuffer && "Access is not valid!"); + + return mpBuffer && (BMP_SCANLINE_ADJUSTMENT(mpBuffer->mnFormat) == BMP_FORMAT_TOP_DOWN); +} + +inline bool BitmapInfoAccess::IsBottomUp() const +{ + return !IsTopDown(); +} + +inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const +{ + assert(mpBuffer && "Access is not valid!"); + + return mpBuffer ? BMP_SCANLINE_FORMAT(mpBuffer->mnFormat) : 0UL; +} + +inline sal_uLong BitmapInfoAccess::GetScanlineSize() const +{ + assert(mpBuffer && "Access is not valid!"); + + return mpBuffer ? mpBuffer->mnScanlineSize : 0UL; +} + +inline sal_uInt16 BitmapInfoAccess::GetBitCount() const +{ + assert(mpBuffer && "Access is not valid!"); + + return mpBuffer ? mpBuffer->mnBitCount : 0; +} + +inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBitmapColor) +{ + if (HasPalette()) + return BitmapColor((sal_uInt8) GetBestPaletteIndex(rBitmapColor)); + else + return rBitmapColor; +} + +inline bool BitmapInfoAccess::HasPalette() const +{ + assert(mpBuffer && "Access is not valid!"); + + return mpBuffer && !!mpBuffer->maPalette; +} + +inline const BitmapPalette& BitmapInfoAccess::GetPalette() const +{ + assert(mpBuffer && "Access is not valid!"); + + return mpBuffer->maPalette; +} + +inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const +{ + assert(HasPalette() && "Bitmap has no palette!"); + + return HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0; +} + +inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor ) const +{ + assert(mpBuffer && "Access is not valid!"); + assert(HasPalette() && "Bitmap has no palette!"); + + return mpBuffer->maPalette[nColor]; +} + +inline const BitmapColor& BitmapInfoAccess::GetBestPaletteColor(const BitmapColor& rBitmapColor) const +{ + return GetPaletteColor(GetBestPaletteIndex(rBitmapColor)); +} + + + +inline ColorMask& BitmapInfoAccess::GetColorMask() const +{ + assert(mpBuffer && "Access is not valid!"); + + return mpBuffer->maColorMask; +} + +inline Scanline BitmapReadAccess::GetBuffer() const +{ + assert(mpBuffer && "Access is not valid!"); + + return mpBuffer ? mpBuffer->mpBits : nullptr; +} + +inline Scanline BitmapReadAccess::GetScanline(long nY) const +{ + assert(mpBuffer && mpScanBuf && "Access is not valid!"); + assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!"); + + return mpScanBuf[nY]; +} + +inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const +{ + assert(mpBuffer && mpScanBuf && "Access is not valid!"); + assert(nX >= 0 && "x-coordinate out of range!"); + assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!"); + assert(nY >= 0 && "y-coordinate out of range!"); + assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!"); + + return mFncGetPixel(mpScanBuf[nY], nX, maColorMask ); +} + +inline sal_uInt8 BitmapReadAccess::GetPixelIndex(long nY, long nX) const +{ + return GetPixel(nY, nX).GetBlueOrIndex(); +} + +inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, long nX) const +{ + assert(pData && "Access is not valid!"); + + return mFncGetPixel( pData, nX, maColorMask ); +} + +inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor) +{ + assert(pData && "Access is not valid!"); + + mFncSetPixel(pData, nX, rBitmapColor, maColorMask); +} + +inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const +{ + if (HasPalette()) + return mpBuffer->maPalette[GetPixelIndex(nY, nX)]; + else + return GetPixel(nY, nX); +} + +inline sal_uInt8 BitmapReadAccess::GetLuminance(long nY, long nX) const +{ + return GetColor(nY, nX).GetLuminance(); +} + +inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette) +{ + assert(mpBuffer && "Access is not valid!"); + + mpBuffer->maPalette = rPalette; +} + +inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount) +{ + assert(mpBuffer && "Access is not valid!"); + + mpBuffer->maPalette.SetEntryCount(nCount); +} + +inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor) +{ + assert(mpBuffer && "Access is not valid!"); + assert(HasPalette() && "Bitmap has no palette!"); + + mpBuffer->maPalette[nColor] = rBitmapColor; +} + +inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBitmapColor) +{ + assert(mpBuffer && "Access is not valid!"); + assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!"); + assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!"); + + mFncSetPixel(mpScanBuf[nY], nX, rBitmapColor, maColorMask); +} + +inline void BitmapWriteAccess::SetPixelIndex(long nY, long nX, sal_uInt8 cIndex) +{ + SetPixel(nY, nX, BitmapColor(cIndex)); +} + +#endif // INCLUDED_VCL_BMPACC_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx deleted file mode 100644 index e2efa9150e39..000000000000 --- a/include/vcl/bmpacc.hxx +++ /dev/null @@ -1,432 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_VCL_BMPACC_HXX -#define INCLUDED_VCL_BMPACC_HXX - -#include -#include -#include -#include - -// - Access functions - -typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, long nX, const ColorMask& rMask); -typedef void (*FncSetPixel)(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - -// - BitmapInfoAccess - -class VCL_DLLPUBLIC BitmapInfoAccess -{ - friend class BitmapReadAccess; - -public: - BitmapInfoAccess(Bitmap& rBitmap); - virtual ~BitmapInfoAccess(); - - inline bool operator!() const; - - inline long Width() const; - inline long Height() const; - - inline bool IsTopDown() const; - inline bool IsBottomUp() const; - - inline sal_uLong GetScanlineFormat() const; - inline sal_uLong GetScanlineSize() const; - - inline sal_uInt16 GetBitCount() const; - inline BitmapColor GetBestMatchingColor(const BitmapColor& rBitmapColor); - - inline bool HasPalette() const; - inline const BitmapPalette& GetPalette() const; - inline sal_uInt16 GetPaletteEntryCount() const; - inline const BitmapColor& GetPaletteColor(sal_uInt16 nColor) const; - inline const BitmapColor& GetBestPaletteColor(const BitmapColor& rBitmapColor) const; - sal_uInt16 GetBestPaletteIndex(const BitmapColor& rBitmapColor) const; - - inline ColorMask& GetColorMask() const; - -private: - BitmapInfoAccess() - {} - - BitmapInfoAccess(const BitmapInfoAccess&) - {} - - BitmapInfoAccess& operator=(const BitmapInfoAccess&) - { - return *this; - } - -protected: - Bitmap maBitmap; - BitmapBuffer* mpBuffer; - ColorMask maColorMask; - BitmapAccessMode mnAccessMode; - - SAL_DLLPRIVATE void ImplCreate(Bitmap& rBitmap); - SAL_DLLPRIVATE void ImplDestroy(); - -protected: - BitmapInfoAccess(Bitmap& rBitmap, BitmapAccessMode nMode); -}; - -// - BitmapReadAccess - -class VCL_DLLPUBLIC BitmapReadAccess : public BitmapInfoAccess -{ - friend class BitmapWriteAccess; - -public: - BitmapReadAccess(Bitmap& rBitmap); - virtual ~BitmapReadAccess(); - - inline Scanline GetBuffer() const; - inline Scanline GetScanline( long nY ) const; - - inline BitmapColor GetPixelFromData( const sal_uInt8* pData, long nX ) const; - inline void SetPixelOnData( sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor ); - - inline BitmapColor GetPixel( long nY, long nX ) const; - inline BitmapColor GetColor( long nY, long nX ) const; - inline sal_uInt8 GetPixelIndex( long nY, long nX ) const; - inline sal_uInt8 GetLuminance( long nY, long nX ) const; - - /** Get the interpolated color at coordinates fY, fX; if outside, return rFallback */ - BitmapColor GetInterpolatedColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; - - /** Get the color at coordinates fY, fX; if outside, return rFallback. Automatically does the correct - inside/outside checks, e.g. static_cast< sal_uInt32 >(-0.25) *is* 0, not -1 and has to be outside */ - BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const; - -private: - - BitmapReadAccess() - {} - - BitmapReadAccess(const BitmapReadAccess&) - : BitmapInfoAccess() - {} - - BitmapReadAccess& operator=(const BitmapReadAccess&) - { - return *this; - } - -protected: - Scanline* mpScanBuf; - FncGetPixel mFncGetPixel; - FncSetPixel mFncSetPixel; - - SAL_DLLPRIVATE void ImplInitScanBuffer( Bitmap& rBitmap ); - SAL_DLLPRIVATE void ImplClearScanBuffer(); - SAL_DLLPRIVATE bool ImplSetAccessPointers( sal_uLong nFormat ); - -public: - - SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const - { - return mpBuffer; - } - - static BitmapColor GetPixelFor_1BIT_MSB_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_1BIT_LSB_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_4BIT_MSN_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_4BIT_LSN_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_8BIT_PAL(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_8BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_16BIT_TC_MSB_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_16BIT_TC_LSB_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_24BIT_TC_BGR(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_24BIT_TC_RGB(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_24BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_32BIT_TC_ABGR(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_32BIT_TC_ARGB(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_32BIT_TC_BGRA(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_32BIT_TC_RGBA(ConstScanline pScanline, long nX, const ColorMask& rMask); - static BitmapColor GetPixelFor_32BIT_TC_MASK(ConstScanline pScanline, long nX, const ColorMask& rMask); - - static void SetPixelFor_1BIT_MSB_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_1BIT_LSB_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_4BIT_MSN_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_4BIT_LSN_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_8BIT_PAL(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_8BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_16BIT_TC_MSB_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_16BIT_TC_LSB_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_24BIT_TC_BGR(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_24BIT_TC_RGB(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_24BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_32BIT_TC_ABGR(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_32BIT_TC_ARGB(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_32BIT_TC_BGRA(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_32BIT_TC_RGBA(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - static void SetPixelFor_32BIT_TC_MASK(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask); - -protected: - BitmapReadAccess(Bitmap& rBitmap, BitmapAccessMode nMode); -}; - -// - BitmapWriteAccess - -class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess -{ -public: - BitmapWriteAccess(Bitmap& rBitmap); - virtual ~BitmapWriteAccess(); - - void CopyScanline(long nY, const BitmapReadAccess& rReadAcc); - void CopyScanline(long nY, - ConstScanline aSrcScanline, - sal_uLong nSrcScanlineFormat, - sal_uLong nSrcScanlineSize); - - void CopyBuffer( const BitmapReadAccess& rReadAcc ); - - inline void SetPalette(const BitmapPalette& rPalette); - inline void SetPaletteEntryCount(sal_uInt16 nCount); - inline void SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor); - - inline void SetPixel(long nY, long nX, const BitmapColor& rBitmapColor); - inline void SetPixelIndex(long nY, long nX, sal_uInt8 cIndex); - - void SetLineColor(const Color& rColor); - - void SetFillColor(); - void SetFillColor(const Color& rColor); - - void Erase(const Color& rColor); - - void DrawLine(const Point& rStart, const Point& rEnd); - - void FillRect(const Rectangle& rRect); - void DrawRect(const Rectangle& rRect); - -private: - - std::unique_ptr mpLineColor; - std::unique_ptr mpFillColor; - - BitmapWriteAccess() - {} - - BitmapWriteAccess(const BitmapWriteAccess&) - : BitmapReadAccess() - {} - - BitmapWriteAccess& operator=(const BitmapWriteAccess&) - { - return *this; - } -}; - -// - Inlines - -inline bool BitmapInfoAccess::operator!() const -{ - return mpBuffer == nullptr; -} - -inline long BitmapInfoAccess::Width() const -{ - return mpBuffer ? mpBuffer->mnWidth : 0L; -} - -inline long BitmapInfoAccess::Height() const -{ - return mpBuffer ? mpBuffer->mnHeight : 0L; -} - -inline bool BitmapInfoAccess::IsTopDown() const -{ - assert(mpBuffer && "Access is not valid!"); - - return mpBuffer && (BMP_SCANLINE_ADJUSTMENT(mpBuffer->mnFormat) == BMP_FORMAT_TOP_DOWN); -} - -inline bool BitmapInfoAccess::IsBottomUp() const -{ - return !IsTopDown(); -} - -inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const -{ - assert(mpBuffer && "Access is not valid!"); - - return mpBuffer ? BMP_SCANLINE_FORMAT(mpBuffer->mnFormat) : 0UL; -} - -inline sal_uLong BitmapInfoAccess::GetScanlineSize() const -{ - assert(mpBuffer && "Access is not valid!"); - - return mpBuffer ? mpBuffer->mnScanlineSize : 0UL; -} - -inline sal_uInt16 BitmapInfoAccess::GetBitCount() const -{ - assert(mpBuffer && "Access is not valid!"); - - return mpBuffer ? mpBuffer->mnBitCount : 0; -} - -inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBitmapColor) -{ - if (HasPalette()) - return BitmapColor((sal_uInt8) GetBestPaletteIndex(rBitmapColor)); - else - return rBitmapColor; -} - -inline bool BitmapInfoAccess::HasPalette() const -{ - assert(mpBuffer && "Access is not valid!"); - - return mpBuffer && !!mpBuffer->maPalette; -} - -inline const BitmapPalette& BitmapInfoAccess::GetPalette() const -{ - assert(mpBuffer && "Access is not valid!"); - - return mpBuffer->maPalette; -} - -inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const -{ - assert(HasPalette() && "Bitmap has no palette!"); - - return HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0; -} - -inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor ) const -{ - assert(mpBuffer && "Access is not valid!"); - assert(HasPalette() && "Bitmap has no palette!"); - - return mpBuffer->maPalette[nColor]; -} - -inline const BitmapColor& BitmapInfoAccess::GetBestPaletteColor(const BitmapColor& rBitmapColor) const -{ - return GetPaletteColor(GetBestPaletteIndex(rBitmapColor)); -} - - - -inline ColorMask& BitmapInfoAccess::GetColorMask() const -{ - assert(mpBuffer && "Access is not valid!"); - - return mpBuffer->maColorMask; -} - -inline Scanline BitmapReadAccess::GetBuffer() const -{ - assert(mpBuffer && "Access is not valid!"); - - return mpBuffer ? mpBuffer->mpBits : nullptr; -} - -inline Scanline BitmapReadAccess::GetScanline(long nY) const -{ - assert(mpBuffer && mpScanBuf && "Access is not valid!"); - assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!"); - - return mpScanBuf[nY]; -} - -inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const -{ - assert(mpBuffer && mpScanBuf && "Access is not valid!"); - assert(nX >= 0 && "x-coordinate out of range!"); - assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!"); - assert(nY >= 0 && "y-coordinate out of range!"); - assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!"); - - return mFncGetPixel(mpScanBuf[nY], nX, maColorMask ); -} - -inline sal_uInt8 BitmapReadAccess::GetPixelIndex(long nY, long nX) const -{ - return GetPixel(nY, nX).GetBlueOrIndex(); -} - -inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, long nX) const -{ - assert(pData && "Access is not valid!"); - - return mFncGetPixel( pData, nX, maColorMask ); -} - -inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor) -{ - assert(pData && "Access is not valid!"); - - mFncSetPixel(pData, nX, rBitmapColor, maColorMask); -} - -inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const -{ - if (HasPalette()) - return mpBuffer->maPalette[GetPixelIndex(nY, nX)]; - else - return GetPixel(nY, nX); -} - -inline sal_uInt8 BitmapReadAccess::GetLuminance(long nY, long nX) const -{ - return GetColor(nY, nX).GetLuminance(); -} - -inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette) -{ - assert(mpBuffer && "Access is not valid!"); - - mpBuffer->maPalette = rPalette; -} - -inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount) -{ - assert(mpBuffer && "Access is not valid!"); - - mpBuffer->maPalette.SetEntryCount(nCount); -} - -inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor) -{ - assert(mpBuffer && "Access is not valid!"); - assert(HasPalette() && "Bitmap has no palette!"); - - mpBuffer->maPalette[nColor] = rBitmapColor; -} - -inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBitmapColor) -{ - assert(mpBuffer && "Access is not valid!"); - assert(nX < mpBuffer->mnWidth && "x-coordinate out of range!"); - assert(nY < mpBuffer->mnHeight && "y-coordinate out of range!"); - - mFncSetPixel(mpScanBuf[nY], nX, rBitmapColor, maColorMask); -} - -inline void BitmapWriteAccess::SetPixelIndex(long nY, long nX, sal_uInt8 cIndex) -{ - SetPixel(nY, nX, BitmapColor(cIndex)); -} - -#endif // INCLUDED_VCL_BMPACC_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx index d54dfc4f4e4e..d4c15e648b82 100644 --- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx +++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx @@ -65,7 +65,7 @@ #include #include -#include +#include #include void LwpBackgroundStuff::Read(LwpObjectStream* pStrm) diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 43c8b7b34459..5c12b2f6d814 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index d86a98d80db8..fcc467920ffc 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -53,7 +53,7 @@ #include #include -#include +#include #include #include diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 7c7d4d88b542..a835a43c7b97 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/sc/source/ui/sidebar/CellBorderUpdater.cxx b/sc/source/ui/sidebar/CellBorderUpdater.cxx index a7c3d5c13684..80fb3461f4a8 100644 --- a/sc/source/ui/sidebar/CellBorderUpdater.cxx +++ b/sc/source/ui/sidebar/CellBorderUpdater.cxx @@ -18,7 +18,7 @@ */ #include "CellBorderUpdater.hxx" -#include +#include #include #include diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index f8d6e1676b68..ce45059ee6de 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -83,7 +83,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index eb039b281a06..8f6f36071c56 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -64,7 +64,7 @@ #include #include #include -#include +#include using namespace ::com::sun::star; diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index c0a2c8653f5e..f77c716c4aa5 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 901a1c0354d4..3addfbfc5194 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -27,7 +27,7 @@ #include "epptdef.hxx" #include "escherex.hxx" #include -#include +#include #include #include #include diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 504957ff1630..892911c76b56 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index aee3bdf1a7e3..712b936d92a6 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 4d4d96510419..844ae34c0b43 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -67,7 +67,7 @@ #include #include "propread.hxx" #include -#include +#include #include "customshowlist.hxx" #include "sddll.hxx" diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx index 9a016f3b33ef..9b4e191e78c1 100644 --- a/sd/source/ui/dlg/vectdlg.cxx +++ b/sd/source/ui/dlg/vectdlg.cxx @@ -26,7 +26,7 @@ #include "sdmod.hxx" #include "sdiocmpt.hxx" #include "vectdlg.hxx" -#include +#include #include #include diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index 7ad3ea278097..934536b5e070 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index 638a215e7c95..f1c0140697aa 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -19,7 +19,7 @@ #include "SlsFramePainter.hxx" #include -#include +#include namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 4ae2e1d68323..c2d55cf14906 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 39531e811200..06f15f82d52b 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index 23e43f30ab30..02d42d52527b 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "graphic.hxx" diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index ac46acd2da52..c154b7f87775 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -107,7 +107,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index f945a9933b17..fe93f9b86a29 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #define OUTPUT_DRAWMODE_COLOR (DrawModeFlags::Default) diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index 78a27d92fc92..31758b6d8a7a 100644 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 25b8809a6906..2e169df9e1ae 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -29,7 +29,7 @@ #include "svx/svdviter.hxx" #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 18c17c906261..3a492653e6f6 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -63,7 +63,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 1bd09a3d3f5f..639cd2e40d6b 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include "svx/svdstr.hrc" diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 9d322122fd30..14e60644ffc3 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -73,7 +73,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 7b3b82f63290..8ec24213b7e5 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 37076ad7a534..c0f199aebfc8 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 74c1f5b5f8f5..0ae24cf6f88a 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index d5036a6d6d7e..69fbed5db117 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index fe925f8e1000..a0dff4f55873 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index a4b1888dc410..d878ff1917c5 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index f1f92020e7d0..42e22ab02691 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/vcl/inc/BitmapSymmetryCheck.hxx b/vcl/inc/BitmapSymmetryCheck.hxx index 586b498ec6ea..c6a02fa83a7f 100644 --- a/vcl/inc/BitmapSymmetryCheck.hxx +++ b/vcl/inc/BitmapSymmetryCheck.hxx @@ -12,7 +12,7 @@ #define INCLUDED_VCL_INC_BITMAPSYMMETRYCHECK_HXX #include -#include +#include class VCL_DLLPUBLIC BitmapSymmetryCheck { diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index be5c7cf79d11..24cf9200e64b 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -27,7 +27,7 @@ #include #include -#include +#include namespace vcl { diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 8c31f20579de..146e7cbfc638 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -130,7 +130,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/qa/cppunit/BitmapFilterTest.cxx b/vcl/qa/cppunit/BitmapFilterTest.cxx index ade5acbc6271..a415043207a3 100644 --- a/vcl/qa/cppunit/BitmapFilterTest.cxx +++ b/vcl/qa/cppunit/BitmapFilterTest.cxx @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index fe8c933668d1..bc7324e2a902 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index b093275d921c..ec39dcce17c0 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -36,7 +36,7 @@ #include "vcl/canvastools.hxx" #include "vcl/dialog.hxx" #include "vcl/outdev.hxx" -#include "vcl/bmpacc.hxx" +#include "vcl/bitmapaccess.hxx" #include "vcl/virdev.hxx" #include "vcl/bitmapex.hxx" diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx index a32ee7d3fd94..4a447701b0b3 100644 --- a/vcl/qa/cppunit/outdev.cxx +++ b/vcl/qa/cppunit/outdev.cxx @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include diff --git a/vcl/source/bitmap/BitmapFilterStackBlur.cxx b/vcl/source/bitmap/BitmapFilterStackBlur.cxx index a2664b702e7c..5cb37d6cece9 100644 --- a/vcl/source/bitmap/BitmapFilterStackBlur.cxx +++ b/vcl/source/bitmap/BitmapFilterStackBlur.cxx @@ -9,7 +9,7 @@ */ #include -#include +#include namespace { diff --git a/vcl/source/bitmap/BitmapProcessor.cxx b/vcl/source/bitmap/BitmapProcessor.cxx index 68a50bdd80e7..a046873177b6 100644 --- a/vcl/source/bitmap/BitmapProcessor.cxx +++ b/vcl/source/bitmap/BitmapProcessor.cxx @@ -9,7 +9,7 @@ */ #include -#include +#include #include BitmapEx BitmapProcessor::createLightImage(const BitmapEx& rBitmapEx) diff --git a/vcl/source/bitmap/BitmapScaleConvolution.cxx b/vcl/source/bitmap/BitmapScaleConvolution.cxx index a596603f827e..abdc475d45cb 100644 --- a/vcl/source/bitmap/BitmapScaleConvolution.cxx +++ b/vcl/source/bitmap/BitmapScaleConvolution.cxx @@ -20,7 +20,7 @@ #include "BitmapScaleConvolution.hxx" #include "ResampleKernel.hxx" -#include +#include #include #include diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx b/vcl/source/bitmap/bitmapscalesuper.cxx index c0b53be8b124..33645f618129 100644 --- a/vcl/source/bitmap/bitmapscalesuper.cxx +++ b/vcl/source/bitmap/bitmapscalesuper.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include diff --git a/vcl/source/filter/igif/decode.hxx b/vcl/source/filter/igif/decode.hxx index 93840f1ade1b..d4a99a71d240 100644 --- a/vcl/source/filter/igif/decode.hxx +++ b/vcl/source/filter/igif/decode.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_SOURCE_FILTER_IGIF_DECODE_HXX #define INCLUDED_VCL_SOURCE_FILTER_IGIF_DECODE_HXX -#include +#include struct GIFLZWTableEntry; diff --git a/vcl/source/filter/igif/gifread.hxx b/vcl/source/filter/igif/gifread.hxx index d8b74211991f..496b0c814933 100644 --- a/vcl/source/filter/igif/gifread.hxx +++ b/vcl/source/filter/igif/gifread.hxx @@ -21,7 +21,7 @@ #define INCLUDED_VCL_SOURCE_FILTER_IGIF_GIFREAD_HXX #include -#include +#include #ifdef _GIFPRIVATE diff --git a/vcl/source/filter/ixbm/xbmread.hxx b/vcl/source/filter/ixbm/xbmread.hxx index 5164dc88c9ea..d72b47ce8982 100644 --- a/vcl/source/filter/ixbm/xbmread.hxx +++ b/vcl/source/filter/ixbm/xbmread.hxx @@ -21,7 +21,7 @@ #define INCLUDED_VCL_SOURCE_FILTER_IXBM_XBMREAD_HXX #include -#include +#include #ifdef _XBMPRIVATE diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx index ebc8e5e7575c..5899505bc937 100644 --- a/vcl/source/filter/ixpm/xpmread.cxx +++ b/vcl/source/filter/ixpm/xpmread.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include "rgbtable.hxx" #define _XPMPRIVATE diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx index 78e818d8d8da..eb019128c10e 100644 --- a/vcl/source/filter/jpeg/JpegReader.cxx +++ b/vcl/source/filter/jpeg/JpegReader.cxx @@ -24,7 +24,7 @@ #include #include "JpegReader.hxx" -#include +#include #include #include #include diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx index 11d85ed047d5..35c04797c07f 100644 --- a/vcl/source/filter/jpeg/JpegWriter.cxx +++ b/vcl/source/filter/jpeg/JpegWriter.cxx @@ -24,7 +24,7 @@ #include #include "JpegWriter.hxx" -#include +#include #include #include diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx index b2e46720790d..c3769870aa3f 100644 --- a/vcl/source/filter/jpeg/jpeg.cxx +++ b/vcl/source/filter/jpeg/jpeg.cxx @@ -21,7 +21,7 @@ #include "JpegWriter.hxx" #include "jpeg.hxx" -#include +#include #include #include diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index 79b375709945..b702348f2194 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx index 371f044633d5..f3217b295f84 100644 --- a/vcl/source/gdi/alpha.cxx +++ b/vcl/source/gdi/alpha.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 6141e1b2c417..57c287de91c6 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index 655374836682..73d5f31111fd 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx index 464f5546fbb9..04961cb3bbd2 100644 --- a/vcl/source/gdi/bitmap4.cxx +++ b/vcl/source/gdi/bitmap4.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include #define S2(a,b) { long t; if( ( t = b - a ) < 0 ) { a += t; b -= t; } } diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 7af0f149016c..c98acddcac0f 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 74edb56856a4..b1d59820ba15 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx index 286ea8fca26a..9d447500af59 100644 --- a/vcl/source/gdi/bmpacc2.cxx +++ b/vcl/source/gdi/bmpacc2.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include BitmapColor BitmapReadAccess::GetPixelFor_1BIT_MSB_PAL(ConstScanline pScanline, long nX, const ColorMask&) { diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx index 5d680c76ba72..754a4bb6cc53 100644 --- a/vcl/source/gdi/bmpacc3.cxx +++ b/vcl/source/gdi/bmpacc3.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx index 76b2aa54d750..bed0528b8a00 100644 --- a/vcl/source/gdi/bmpfast.cxx +++ b/vcl/source/gdi/bmpfast.cxx @@ -19,7 +19,7 @@ #include #include -#include +#include #define FAST_ARGB_BGRA diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 96f5c328a479..424408434ecd 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 1fce7910b23f..4e496f7862fa 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include #include diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx index 4dd682bc2175..b1c9af07ca5f 100644 --- a/vcl/source/gdi/octree.cxx +++ b/vcl/source/gdi/octree.cxx @@ -19,7 +19,7 @@ #include -#include +#include #include diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index d9813cd7fee1..e576f2a5c028 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index aede71ae4249..599d25306e8d 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -23,7 +23,7 @@ #include "vcl/virdev.hxx" #include "vcl/gdimtf.hxx" #include "vcl/metaact.hxx" -#include "vcl/bmpacc.hxx" +#include "vcl/bitmapaccess.hxx" #include #include "svdata.hxx" diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index 7996f46fe7c1..8af9f0b200d0 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index f7c7ed8b6675..f4eb63912490 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx index 84acd47b3036..d7056bc897e8 100644 --- a/vcl/source/gdi/print2.cxx +++ b/vcl/source/gdi/print2.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx index 6141b2aae55e..1754a9a905b6 100644 --- a/vcl/source/gdi/salmisc.cxx +++ b/vcl/source/gdi/salmisc.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include #include diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index bd09b4c41346..6d594b30a638 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 19f8a754458a..ba8b17a1f956 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include diff --git a/vcl/source/image/ImageArrayData.cxx b/vcl/source/image/ImageArrayData.cxx index d7b3bbbcf0ba..cee50461dd82 100644 --- a/vcl/source/image/ImageArrayData.cxx +++ b/vcl/source/image/ImageArrayData.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx index 4b9fba12666d..52e5083e8372 100644 --- a/vcl/source/image/ImplImage.cxx +++ b/vcl/source/image/ImplImage.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/image/ImplImageList.cxx b/vcl/source/image/ImplImageList.cxx index bc137fc9e2e8..56750f5d7cf1 100644 --- a/vcl/source/image/ImplImageList.cxx +++ b/vcl/source/image/ImplImageList.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index d152a0ffd306..e8995d52ad95 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 5892a625300e..750f33ed371a 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index b77c409c257e..01b6cb8cce52 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 8bb77789378f..1c1c31a8ef4e 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 6f33f58806f9..33f04b4fd177 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 629cf880a8cf..c94b4c2c3d8d 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -36,7 +36,7 @@ #include "generic/printergfx.hxx" -#include "vcl/bmpacc.hxx" +#include "vcl/bitmapaccess.hxx" #include void X11SalGraphics::CopyScreenArea( Display* pDisplay, diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 63f7c9d68cd2..905abdae12e9 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -33,7 +33,7 @@ #include "vcl/layout.hxx" #include "vcl/printerinfomanager.hxx" #include "vcl/settings.hxx" -#include "vcl/bmpacc.hxx" +#include "vcl/bitmapaccess.hxx" #include "vcl/opengl/OpenGLContext.hxx" #include diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index 6433921835fd..2f259b63dee8 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -32,7 +32,7 @@ #include #include "vcl/salbtype.hxx" -#include "vcl/bmpacc.hxx" +#include "vcl/bitmapaccess.hxx" #include "outdata.hxx" #include "salgdiimpl.hxx" #include "opengl/win/gdiimpl.hxx" diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index d0e070a577de..9fe99c0a0c8c 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 00a1181c8194..4c1fc373553f 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include -- cgit