Resolves: #i121445# Added transparency support to the gallery

(cherry picked from commit cf417aec41decab94b5f1e82f6409e97a6c02fb5)

Conflicts:
extras/source/gallery/gallery_system/sg2.sdg
extras/source/gallery/gallery_system/sg2.thm
svx/inc/galtheme.hrc
svx/inc/svx/fontworkgallery.hxx
svx/inc/svx/gallery.hxx
svx/inc/svx/galtheme.hxx
svx/source/gallery2/galctrl.cxx
svx/source/gallery2/galexpl.cxx
svx/source/gallery2/galobj.cxx
svx/source/tbxctrls/fontworkgallery.cxx
vcl/inc/vcl/outdev.hxx
vcl/source/gdi/outdev6.cxx

Change-Id: I519a2cf4e16bb42ecfd9c4b48094e65adcc35599
(cherry picked from commit ddec662e8dc234b7196c1b3c28db5da743557ec6)

4 files changed, 17 insertions, 9 deletions

diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 34f1bafabcb9..3dec29f1563e 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -103,11 +103,11 @@ class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog
     SdrObject**         mppSdrObject;
     SdrModel*           mpDestModel;
 
-    void            initfavorites(sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites);
+    void            initFavorites(sal_uInt16 nThemeId);
     void            insertSelectedFontwork();
-    void            fillFavorites( sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites );
+    void            fillFavorites(sal_uInt16 nThemeId);
 
-    std::vector< Bitmap * > maFavoritesHorizontal;
+    std::vector< BitmapEx> maFavoritesHorizontal;
 
 public:
     FontWorkGalleryDialog( SdrView* pView, Window* pParent, sal_uInt16 nSID );
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index a2b010b9f4f0..778474b3066c 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -55,7 +55,7 @@ class FmFormModel;
 class SdrModel;
 class Graphic;
 class FmFormModel;
-class Bitmap;
+class BitmapEx;
 class OutputDevice;
 
 class SVX_DLLPUBLIC GalleryExplorer
@@ -94,19 +94,19 @@ public:
                                            const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
 
     static sal_Bool                 GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
-                                               Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
+                                               Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL,
                                                sal_Bool bProgess = sal_False );
     static sal_Bool                 GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
-                                               Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
+                                               Graphic* pGraphic = NULL, BitmapEx* pThumb = NULL,
                                                sal_Bool bProgess = sal_False );
 
     static sal_uIntPtr              GetSdrObjCount( const String& rThemeName );
     static sal_uIntPtr              GetSdrObjCount( sal_uIntPtr nThemeId );
 
     static sal_Bool                 GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos,
-                                           SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
+                                           SdrModel* pModel = NULL, BitmapEx* pThumb = NULL );
     static sal_Bool                 GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
-                                           SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
+                                           SdrModel* pModel = NULL, BitmapEx* pThumb = NULL );
 
     static sal_Bool                 BeginLocking( const String& rThemeName );
     static sal_Bool                 BeginLocking( sal_uIntPtr nThemeId );
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 0326418e8e6a..d1b1461b491b 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -190,7 +190,7 @@ public:
                                     return ImplGetGalleryObject( nPos )->aURL;
                                 }
 
-    sal_Bool                        GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool bProgress = sal_False );
+    sal_Bool                        GetThumb( sal_uIntPtr nPos, BitmapEx& rBmp, sal_Bool bProgress = sal_False );
 
     SVX_DLLPUBLIC sal_Bool                      GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress = sal_False );
     SVX_DLLPUBLIC sal_Bool                      InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = LIST_APPEND );
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index b0bb8e5c9389..b3a2f9ef87e1 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -794,6 +794,14 @@ public:
     bool                DrawEPS( const Point& rPt, const Size& rSz,
                                  const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL );
 
+    /// Fill the given rectangle with checkered rectangles of size nLen x nLen using the colors aStart and aEnd
+    void DrawCheckered(
+        const Point& rPos,
+        const Size& rSize,
+        sal_uInt32 nLen = 8,
+        Color aStart = Color(COL_WHITE),
+        Color aEnd = Color(COL_BLACK));
+
     Color               GetPixel( const Point& rPt ) const;
 
     Bitmap              GetBitmap( const Point& rSrcPt, const Size& rSize ) const;