Resolves: #i122418# Added workaround to not use GetBitmap on windows

(cherry picked from commit 136976efb17b8617a83c7f26601cd04031b51e7f)

Conflicts:
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/bitmapex.hxx
vcl/source/gdi/bitmap4.cxx
vcl/source/gdi/bitmapex.cxx

Change-Id: I9c3aeae76c155c9050404f67adeb91106502c3f1

2 files changed, 32 insertions, 29 deletions

diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index b4e07fb77aa5..49dd1475bfc1 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -811,35 +811,6 @@ public:
                                     const Link* pProgress = NULL );
 
 public:
-    /** Draw a blend frame to the Bitmap
-
-        @param nAlpha
-        The blend value defines how strong the frame will be blended with the
-        existing content, 255 == full coverage, 0 == no frame will be drawn
-
-        @param aColorTopLeft, aColorBottomRight, aColorTopRight, aColorBottomLeft
-        The colors defining the frame. If the version without aColorTopRight and
-        aColorBottomLeft is used, these colors are linearly interpolated from
-        aColorTopLeft and aColorBottomRight using the width and height of the area
-
-        @param rTopLeft
-        The start point of the frame in pixels
-
-        @param rSize
-        The size of the frame in pixels
-     */
-    void DrawBlendFrame(
-        sal_uInt8 nAlpha = 128,
-        Color aColorTopLeft = Color(COL_WHITE),
-        Color aColorBottomRight = Color(COL_BLACK));
-    void DrawBlendFrame(
-        const Point& rTopLeft,
-        const Size& rSize,
-        sal_uInt8 nAlpha = 128,
-        Color   aColorTopLeft = Color(COL_WHITE),
-        Color   aColorTopRight = Color(COL_GRAY),
-        Color   aColorBottomRight = Color(COL_BLACK),
-        Color   aColorBottomLeft = Color(COL_GRAY));
 
     BitmapReadAccess*       AcquireReadAccess();
     BitmapWriteAccess*      AcquireWriteAccess();
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index 42b7b997cd16..9a0d159d6b74 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -430,6 +430,38 @@ public:
                  const Size &rSize );
 };
 
+// ------------------------------------------------------------------
+/** Create a blend frame as BitmapEx
+
+    @param nAlpha
+    The blend value defines how strong the frame will be blended with the
+    existing content, 255 == full coverage, 0 == no frame will be drawn
+
+    @param aColorTopLeft, aColorBottomRight, aColorTopRight, aColorBottomLeft
+    The colors defining the frame. If the version without aColorTopRight and
+    aColorBottomLeft is used, these colors are linearly interpolated from
+    aColorTopLeft and aColorBottomRight using the width and height of the area
+
+    @param rSize
+    The size of the frame in pixels
+    */
+
+BitmapEx VCL_DLLPUBLIC createBlendFrame(
+    const Size& rSize,
+    sal_uInt8 nAlpha,
+    Color aColorTopLeft,
+    Color aColorBottomRight);
+
+BitmapEx VCL_DLLPUBLIC createBlendFrame(
+    const Size& rSize,
+    sal_uInt8 nAlpha,
+    Color aColorTopLeft,
+    Color aColorTopRight,
+    Color aColorBottomRight,
+    Color aColorBottomLeft);
+
+// ------------------------------------------------------------------
+
 #endif // _SV_BITMAPEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */