diff options
| author | Armin Le Grand <alg@apache.org> | 2012-12-07 17:15:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-10 17:04:38 +0100 |
| commit | bbc58f2043eb0787f498f62ac54500bd31d8c89c (patch) | |
| tree | 832b790c92eb07c3b38ed746f31831a6b1b891f6 /include/svx/galtheme.hxx | |
| parent | 94298db96fa14f6c7c8eb67b2faab3ac01bd5ccd (diff) | |
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)
Diffstat (limited to 'include/svx/galtheme.hxx')
| -rw-r--r-- | include/svx/galtheme.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 ); |