basebmp now only used from vcl/headless code

Change-Id: I068d404431d3565f6ad5741edbd3693225824a4d

31 files changed, 28 insertions, 70 deletions

diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index f563fd91cf41..7382085b6c7b 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -184,9 +184,6 @@
 #include <vcl/wall.hxx>
 #include <vcl/window.hxx>
 #include <vcl/xtextedt.hxx>
-#include <basebmp/basebmpdllapi.h>
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index dddbe22619da..ee9952a5f18a 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -174,9 +174,6 @@
 #include <vcl/wall.hxx>
 #include <vcl/window.hxx>
 #include <ChartModel.hxx>
-#include <basebmp/basebmpdllapi.h>
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 365786ab8ddb..6885b901a881 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -177,9 +177,6 @@
 #include <vcl/virdev.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/window.hxx>
-#include <basebmp/basebmpdllapi.h>
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
index 2119e15735fb..c7aee9d1f043 100644
--- a/desktop/CppunitTest_desktop_lib.mk
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,desktop_lib, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
-	basebmp \
 	comphelper \
 	cppu \
 	cppuhelper \
@@ -32,7 +31,10 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
     $(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_CppunitTest_use_external,desktop_lib,boost_headers))
+$(eval $(call gb_CppunitTest_use_externals,desktop_lib, \
+    boost_headers \
+    cairo \
+))
 
 $(eval $(call gb_CppunitTest_use_api,desktop_lib,\
 	offapi \
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index ef95ecfbdc19..6062da8ee892 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\
 $(eval $(call gb_Library_set_precompiled_header,sofficeapp,$(SRCDIR)/desktop/inc/pch/precompiled_sofficeapp))
 
 $(eval $(call gb_Library_use_libraries,sofficeapp,\
-    $(if $(filter $(OS),ANDROID),,basebmp) \
     comphelper \
     cppu \
     cppuhelper \
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index f06959545722..01657b9a1f81 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -14,7 +14,6 @@
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/XReschedule.hpp>
 #include <com/sun/star/awt/Toolkit.hpp>
-#include <basebmp/bitmapdevice.hxx>
 #include <boost/property_tree/json_parser.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/objsh.hxx>
@@ -27,6 +26,7 @@
 #include <svl/srchitem.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <unotools/tempfile.hxx>
+#include <cairo.h>
 
 #include "../../inc/lib/init.hxx"
 
@@ -351,8 +351,7 @@ void DesktopLOKTest::testPaintTile()
     LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
     int nCanvasWidth = 100;
     int nCanvasHeight = 300;
-    sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(basebmp::Format::ThirtyTwoBitTcMaskBGRA,
-                                                               nCanvasWidth);
+    sal_Int32 nStride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, nCanvasWidth);
     std::vector<unsigned char> aBuffer(nStride * nCanvasHeight);
     int nTilePosX = 0;
     int nTilePosY = 0;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f58d8a0e19ef..28a54420eccd 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -103,7 +103,7 @@ typedef struct
 
 // We need a shared_array for passing into the BitmapDevice (via
 // VirtualDevice.SetOutputSizePixelScaleOffsetAndBuffer which goes via the
-// SvpVirtualDevice, ending up in the basebmp BitmapDevice. However as we're
+// SvpVirtualDevice, ending up in the cairo surface. However as we're
 // given the array externally we can't delete it, and hence need to override
 // shared_array's default of deleting its pointer.
 template<typename T>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 4f29f1bf8de0..afc4ed02e71e 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -129,9 +129,6 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
-#include <basebmp/basebmpdllapi.h>
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index f31bc4ef096f..b0b960e1befd 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_VCL_VIRDEV_HXX
 #define INCLUDED_VCL_VIRDEV_HXX
 
-#include <basebmp/bitmapdevice.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/salgtype.hxx>
 #include <vcl/outdev.hxx>
+#include <boost/shared_array.hpp>
 
 class SalVirtualDevice;
 struct SystemGraphicsData;
@@ -46,9 +46,9 @@ private:
 
     SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, DeviceFormat eFormat, const SystemGraphicsData *pData = nullptr );
     SAL_DLLPRIVATE bool InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
-                                                     const basebmp::RawMemorySharedArray &pBuffer );
+                                                     const boost::shared_array<sal_uInt8>  &pBuffer );
     SAL_DLLPRIVATE bool ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
-                                                const basebmp::RawMemorySharedArray &pBuffer );
+                                                const boost::shared_array<sal_uInt8> &pBuffer );
 
     VirtualDevice (const VirtualDevice &) = delete;
     VirtualDevice & operator= (const VirtualDevice &) = delete;
@@ -126,7 +126,7 @@ public:
     bool                SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize,
                                                                 const Fraction& rScale,
                                                                 const Point& rNewOffset,
-                                                                const basebmp::RawMemorySharedArray &pBuffer );
+                                                                const boost::shared_array<sal_uInt8>  &pBuffer );
 
     bool                SetOutputSize( const Size& rNewSize, bool bErase = true )
                             { return SetOutputSizePixel( LogicToPixel( rNewSize ), bErase ); }
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 12fb03472a61..8b52be9f343c 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -192,9 +192,6 @@
 #include <RptObject.hxx>
 #include <RptPage.hxx>
 #include <UndoActions.hxx>
-#include <basebmp/basebmpdllapi.h>
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index cca93ad3a9dc..c8182d05eb0d 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -185,9 +185,6 @@
 #include <vcl/virdev.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/window.hxx>
-#include <basebmp/basebmpdllapi.h>
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index b386337dd989..b1c899f32d5e 100644
--- a/sw/inc/pch/precompiled_msword.hxx
+++ b/sw/inc/pch/precompiled_msword.hxx
@@ -183,9 +183,6 @@
 #include <IMark.hxx>
 #include <IShellCursorSupplier.hxx>
 #include <SwGetPoolIdFromName.hxx>
-#include <basebmp/basebmpdllapi.h>
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 57d9325c979a..96c8fef7d98a 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -192,9 +192,6 @@
 #include <IMark.hxx>
 #include <SwNumberTreeTypes.hxx>
 #include <SwStyleNameMapper.hxx>
-#include <basebmp/basebmpdllapi.h>
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index dd664e06835d..9a8c1b370eca 100644
--- a/sw/inc/pch/precompiled_vbaswobj.hxx
+++ b/sw/inc/pch/precompiled_vbaswobj.hxx
@@ -176,9 +176,6 @@
 #include <IMark.hxx>
 #include <IShellCursorSupplier.hxx>
 #include <SwGetPoolIdFromName.hxx>
-#include <basebmp/basebmpdllapi.h>
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/color/bcolormodifier.hxx>
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 8a90c49b6b06..8d013d93e369 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -63,7 +63,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
     sot \
     ucbhelper \
     basegfx \
-    basebmp \
     comphelper \
     cppuhelper \
     i18nlangtag \
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 3ccb79f1612c..b39face75806 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -18,7 +18,6 @@
 #include <unx/gendata.hxx>
 #include <osl/detail/android-bootstrap.h>
 #include <rtl/strbuf.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <vcl/settings.hxx>
 
 #define LOGTAG "LibreOffice/androidinst"
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 01cb18fa28b2..626ca1f6bb52 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -25,12 +25,10 @@
 #include "headless/svpgdi.hxx"
 
 #include <basegfx/vector/b2ivector.hxx>
-#include <basebmp/scanlineformats.hxx>
 
 #include <cairo.h>
 
 using namespace basegfx;
-using namespace basebmp;
 
 SvpSalVirtualDevice::~SvpSalVirtualDevice()
 {
@@ -52,11 +50,11 @@ void SvpSalVirtualDevice::ReleaseGraphics( SalGraphics* pGraphics )
 
 bool SvpSalVirtualDevice::SetSize( long nNewDX, long nNewDY )
 {
-    return SetSizeUsingBuffer(nNewDX, nNewDY, basebmp::RawMemorySharedArray());
+    return SetSizeUsingBuffer(nNewDX, nNewDY, boost::shared_array<sal_uInt8>());
 }
 
 bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY,
-        const basebmp::RawMemorySharedArray &pBuffer )
+        const boost::shared_array<sal_uInt8> &pBuffer )
 {
     B2IVector aDevSize( nNewDX, nNewDY );
     if( aDevSize.getX() == 0 )
diff --git a/vcl/inc/cairotextrender.hxx b/vcl/inc/cairotextrender.hxx
index 1070ad863078..a645c901198f 100644
--- a/vcl/inc/cairotextrender.hxx
+++ b/vcl/inc/cairotextrender.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
 
 #include "textrender.hxx"
-#include <basebmp/bitmapdevice.hxx>
 #include <vcl/region.hxx>
 #include <deque>
 
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 19d36214691d..9cbe8e73056f 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/sysdata.hxx>
 #include <basegfx/range/b2ibox.hxx>
-#include <basebmp/bitmapdevice.hxx>
 
 #include <salframe.hxx>
 
diff --git a/vcl/inc/headless/svpvd.hxx b/vcl/inc/headless/svpvd.hxx
index 8d6357e09e4b..967dc0fad7bb 100644
--- a/vcl/inc/headless/svpvd.hxx
+++ b/vcl/inc/headless/svpvd.hxx
@@ -47,7 +47,7 @@ public:
 
     virtual bool        SetSize( long nNewDX, long nNewDY ) override;
     virtual bool        SetSizeUsingBuffer( long nNewDX, long nNewDY,
-                                            const basebmp::RawMemorySharedArray &pBuffer
+                                            const boost::shared_array<sal_uInt8> &pBuffer
                                           ) override;
 
     // SalGeometryProvider
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 19dfa3cf4339..f5a618abc93f 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INC_OPENGL_SALBMP_H
 #define INCLUDED_VCL_INC_OPENGL_SALBMP_H
 
-#include <basebmp/bitmapdevice.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
 
 #include "vcl/salbtype.hxx"
@@ -30,6 +29,7 @@
 #include <salbmp.hxx>
 
 #include <deque>
+#include <boost/shared_array.hpp>
 
 struct  BitmapBuffer;
 class   BitmapPalette;
@@ -40,7 +40,7 @@ private:
     OpenGLTexture                       maTexture;
     bool                                mbDirtyTexture;
     BitmapPalette                       maPalette;
-    basebmp::RawMemorySharedArray       maUserBuffer;
+    boost::shared_array<sal_uInt8>      maUserBuffer;
     sal_uInt16                          mnBits;
     sal_uInt16                          mnBytesPerRow;
     int                                 mnWidth;
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 938f6583ebc1..afe79863777d 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -22,8 +22,6 @@
 
 #include "tools/gen.hxx"
 
-#include "basebmp/bitmapdevice.hxx"
-
 #include "vcl/salbtype.hxx"
 
 #include "quartz/salgdi.h"
@@ -32,6 +30,8 @@
 #include "salvd.hxx"
 #include "salbmp.hxx"
 
+#include <boost/shared_array.hpp>
+
 // - SalBitmap  -
 
 struct  BitmapBuffer;
@@ -43,8 +43,8 @@ public:
     CGContextRef                    mxGraphicContext;
     mutable CGImageRef              mxCachedImage;
     BitmapPalette                   maPalette;
-    basebmp::RawMemorySharedArray   maUserBuffer;
-    basebmp::RawMemorySharedArray   maContextBuffer;
+    boost::shared_array<sal_uInt8>  maUserBuffer;
+    boost::shared_array<sal_uInt8>  maContextBuffer;
     sal_uInt16                      mnBits;
     int                             mnWidth;
     int                             mnHeight;
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index 872a73edff29..4500cd9748c4 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_VCL_INC_SALVD_HXX
 #define INCLUDED_VCL_INC_SALVD_HXX
 
-#include <basebmp/bitmapdevice.hxx>
 #include <vcl/dllapi.h>
 #include <salgeom.hxx>
+#include <boost/shared_array.hpp>
 
 class SalGraphics;
 
@@ -47,7 +47,7 @@ public:
 
     // Set new size using a buffer at the given address
     virtual bool            SetSizeUsingBuffer( long nNewDX, long nNewDY,
-                                                const basebmp::RawMemorySharedArray & /* pBuffer */ )
+                                                const boost::shared_array<sal_uInt8> & /* pBuffer */ )
         {
             // Only the headless virtual device has an implementation that uses
             // pBuffer (and bTopDown).
diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx
index f55619a93c61..edd60fbf2f60 100644
--- a/vcl/inc/textrender.hxx
+++ b/vcl/inc/textrender.hxx
@@ -24,7 +24,6 @@
 #include <vcl/salgtype.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/metric.hxx>
-#include <basebmp/bitmapdevice.hxx>
 #include "salgdi.hxx"
 #include "salglyphid.hxx"
 #include "fontsubset.hxx"
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 1a7429dffafe..264ceec08321 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -26,7 +26,6 @@
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
-#include <basebmp/bitmapdevice.hxx>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <tools/gen.hxx>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index c5f14f88949b..fbf84e053147 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -39,8 +39,6 @@
 
 #include "tools/link.hxx"
 
-#include <basebmp/bitmapdevice.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <com/sun/star/awt/XTopWindow.hpp>
 
 #include <list>
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 03497dc44921..e8cbc313a3a4 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -726,7 +726,7 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
     // maUserBuffer must be unique when we are doing the write access
     if (nMode == BITMAP_WRITE_ACCESS && maUserBuffer && !maUserBuffer.unique())
     {
-        basebmp::RawMemorySharedArray aBuffer(maUserBuffer);
+        boost::shared_array<sal_uInt8> aBuffer(maUserBuffer);
 
         maUserBuffer.reset();
         AllocateUserData();
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 9683066eecca..bbb82c019fb3 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -22,8 +22,6 @@
 #include <cstddef>
 #include <limits>
 
-#include <basebmp/scanlineformats.hxx>
-#include <basebmp/color.hxx>
 #include <basegfx/vector/b2ivector.hxx>
 #include <tools/color.hxx>
 #include <vcl/bitmap.hxx>
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index d4dd9582028e..d911d809b0c2 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 #include <config_folders.h>
 
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index 75458d2cc004..13050e4ce5d9 100644
--- a/vcl/quartz/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <basebmp/color.hxx>
-#include <basebmp/scanlineformats.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/range/b2drectangle.hxx>
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index a83f88f1df63..259d5e1c9dc0 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -289,7 +289,7 @@ void VirtualDevice::dispose()
 }
 
 bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
-                                                 const basebmp::RawMemorySharedArray &pBuffer )
+                                                 const boost::shared_array<sal_uInt8> &pBuffer )
 {
     SAL_INFO( "vcl.gdi",
               "VirtualDevice::InnerImplSetOutputSizePixel( " << rNewSize.Width() << ", "
@@ -395,7 +395,7 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect )
 }
 
 bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
-                                            const basebmp::RawMemorySharedArray &pBuffer )
+                                            const boost::shared_array<sal_uInt8> &pBuffer )
 {
     if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) )
     {
@@ -411,7 +411,7 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
             {
                 mpAlphaVDev = VclPtr<VirtualDevice>::Create(*this, meAlphaFormat);
                 mpAlphaVDev->InnerImplSetOutputSizePixel(rNewSize, bErase,
-                                                         basebmp::RawMemorySharedArray());
+                                                         boost::shared_array<sal_uInt8>());
             }
 
             // TODO: copy full outdev state to new one, here. Also needed in outdev2.cxx:DrawOutDev
@@ -444,12 +444,12 @@ void VirtualDevice::EnableRTL( bool bEnable )
 
 bool VirtualDevice::SetOutputSizePixel( const Size& rNewSize, bool bErase )
 {
-    return ImplSetOutputSizePixel(rNewSize, bErase, basebmp::RawMemorySharedArray());
+    return ImplSetOutputSizePixel(rNewSize, bErase, boost::shared_array<sal_uInt8>());
 }
 
 bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(
     const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset,
-    const basebmp::RawMemorySharedArray &pBuffer )
+    const boost::shared_array<sal_uInt8> &pBuffer )
 {
     if (pBuffer) {
         MapMode mm = GetMapMode();