move Bitmap::ScopedWriteAccess inside vcl

would have liked to make the AcquireWriteAccess methods DLLPRIVATE, but
they are needed by the workbench and testing code

Change-Id: I22497788eb68dfb84b7e542e5ef53322892a5274
Reviewed-on: https://gerrit.libreoffice.org/51310
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>

4 files changed, 1 insertions, 76 deletions

diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 396e437cf93f..1f7876b23d58 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -68,8 +68,6 @@ public:
 
     typedef vcl::ScopedBitmapAccess< BitmapReadAccess, AlphaMask, &AlphaMask::AcquireReadAccess >
         ScopedReadAccess;
-    typedef vcl::ScopedBitmapAccess< BitmapWriteAccess, AlphaMask, &AlphaMask::AcquireWriteAccess >
-        ScopedWriteAccess;
 
 private:
     friend class BitmapEx;
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 2549c9c05a01..172230c61a8f 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -725,7 +725,6 @@ public:
     static void             ReleaseAccess( BitmapInfoAccess* pAccess );
 
     typedef vcl::ScopedBitmapAccess<BitmapReadAccess, Bitmap, &Bitmap::AcquireReadAccess> ScopedReadAccess;
-    typedef vcl::ScopedBitmapAccess<BitmapWriteAccess, Bitmap, &Bitmap::AcquireWriteAccess> ScopedWriteAccess;
     typedef vcl::ScopedBitmapAccess<BitmapInfoAccess, Bitmap, &Bitmap::AcquireInfoAccess> ScopedInfoAccess;
 
 private:
diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 5403cea3e783..91343e501ea7 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -281,78 +281,6 @@ public:
 };
 
 
-class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess
-{
-public:
-    BitmapWriteAccess(Bitmap& rBitmap);
-    virtual ~BitmapWriteAccess() override;
-
-    void CopyScanline(long nY, const BitmapReadAccess& rReadAcc);
-    void CopyScanline(long nY,
-                      ConstScanline aSrcScanline,
-                      ScanlineFormat nSrcScanlineFormat,
-                      sal_uLong nSrcScanlineSize);
-
-    void CopyBuffer( const BitmapReadAccess& rReadAcc );
-
-    void SetPalette(const BitmapPalette& rPalette)
-    {
-        assert(mpBuffer && "Access is not valid!");
-
-        mpBuffer->maPalette = rPalette;
-    }
-
-    void SetPaletteEntryCount(sal_uInt16 nCount)
-    {
-        assert(mpBuffer && "Access is not valid!");
-
-        mpBuffer->maPalette.SetEntryCount(nCount);
-    }
-
-    void SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor)
-    {
-        assert(mpBuffer && "Access is not valid!");
-        assert(HasPalette() && "Bitmap has no palette!");
-
-        mpBuffer->maPalette[nColor] = rBitmapColor;
-    }
-
-    void 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(GetScanline(nY), nX, rBitmapColor, maColorMask);
-    }
-
-    void SetPixelIndex(long nY, long nX, sal_uInt8 cIndex)
-    {
-        SetPixel(nY, nX, BitmapColor(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 tools::Rectangle& rRect);
-    void DrawRect(const tools::Rectangle& rRect);
-
-private:
-
-    std::unique_ptr<BitmapColor> mpLineColor;
-    std::unique_ptr<BitmapColor> mpFillColor;
-
-    BitmapWriteAccess() = delete;
-    BitmapWriteAccess(const BitmapWriteAccess&) = delete;
-    BitmapWriteAccess& operator=(const BitmapWriteAccess&) = delete;
-};
-
 #endif // INCLUDED_VCL_BMPACC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/scopedbitmapaccess.hxx b/include/vcl/scopedbitmapaccess.hxx
index bcdfa2b1bd20..f63bcc55f8a3 100644
--- a/include/vcl/scopedbitmapaccess.hxx
+++ b/include/vcl/scopedbitmapaccess.hxx
@@ -35,7 +35,7 @@ namespace vcl
     pReadAccess->SetPixel()...
 
     Bitmap aBitmap2;
-    Bitmap::ScopedWriteAccess pWriteAccess( bCond ? aBitmap2.AcquireWriteAccess() : 0, aBitmap2 );
+    BitmapScopedWriteAccess pWriteAccess( bCond ? aBitmap2.AcquireWriteAccess() : 0, aBitmap2 );
     if ( pWriteAccess )...
 
     @attention for practical reasons, ScopedBitmapAccess stores a