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/gallery.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/gallery.hxx')
| -rw-r--r-- | include/svx/gallery.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
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 ); |