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 /svx/inc/galobj.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 'svx/inc/galobj.hxx')
| -rw-r--r-- | svx/inc/galobj.hxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index fed858cba3e6..09e038267002 100644 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -57,7 +57,7 @@ private: protected: - Bitmap aThumbBmp; + BitmapEx aThumbBmp; // Allow transparence to survive GDIMetaFile aThumbMtf; INetURLObject aURL; String aUserName; @@ -78,7 +78,7 @@ public: virtual SgaObjKind GetObjKind() const = 0; virtual sal_uInt16 GetVersion() const = 0; - virtual Bitmap GetThumbBmp() const { return aThumbBmp; } + virtual BitmapEx GetThumbBmp() const { return aThumbBmp; } const GDIMetaFile& GetThumbMtf() const { return aThumbMtf; } const INetURLObject& GetURL() const { return aURL; } sal_Bool IsValid() const { return bIsValid; } @@ -109,7 +109,7 @@ public: virtual ~SgaObjectSound(); virtual SgaObjKind GetObjKind() const { return SGA_OBJ_SOUND; } - virtual Bitmap GetThumbBmp() const; + virtual BitmapEx GetThumbBmp() const; GalSoundType GetSoundType() const { return eSoundType; } }; @@ -136,10 +136,6 @@ public: virtual ~SgaObjectSvDraw() {}; virtual SgaObjKind GetObjKind() const { return SGA_OBJ_SVDRAW; } - -public: - - static sal_Bool DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); }; class SgaObjectBmp: public SgaObject |