BitmapEx->Bitmap in SgaObject
now that Bitmap supports transparency Change-Id: I1e93374ec4afa30c7c7a699d9658912e3933fa3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190422 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
+1
-1
@@ -85,7 +85,7 @@ public:
|
||||
friend SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj );
|
||||
friend SvStream& ReadSgaObject( SvStream& rIn, SgaObject& rObj );
|
||||
|
||||
BitmapEx createPreviewBitmapEx(const Size& rSizePixel) const;
|
||||
Bitmap createPreviewBitmap(const Size& rSizePixel) const;
|
||||
};
|
||||
|
||||
class SgaObjectSound final : public SgaObject
|
||||
|
||||
@@ -1114,7 +1114,7 @@ void GalleryBrowser::UpdateRows(bool bVisibleOnly)
|
||||
std::unique_ptr<SgaObject> xObj = mpCurTheme->AcquireObject(i);
|
||||
if (xObj)
|
||||
{
|
||||
aBitmap = Bitmap(xObj->createPreviewBitmapEx(maPreviewSize));
|
||||
aBitmap = xObj->createPreviewBitmap(maPreviewSize);
|
||||
sItemTextTitle = GalleryBrowser::GetItemText(*xObj, GalleryItemFlags::Title);
|
||||
sItemTextPath = GalleryBrowser::GetItemText(*xObj, GalleryItemFlags::Path);
|
||||
|
||||
|
||||
@@ -339,7 +339,7 @@ void GalleryIconView::UserDraw(const UserDrawEvent& rUDEvt)
|
||||
|
||||
if(pObj)
|
||||
{
|
||||
aBitmap = Bitmap(pObj->createPreviewBitmapEx(aSize));
|
||||
aBitmap = pObj->createPreviewBitmap(aSize);
|
||||
aItemTextTitle = GalleryBrowser::GetItemText(*pObj, GalleryItemFlags::Title);
|
||||
|
||||
mpTheme->SetPreviewBitmapAndStrings(nId - 1, aBitmap, aSize, aItemTextTitle, aItemTextPath);
|
||||
|
||||
@@ -55,9 +55,9 @@ SgaObject::SgaObject(const SgaObject& aObject)
|
||||
{
|
||||
}
|
||||
|
||||
BitmapEx SgaObject::createPreviewBitmapEx(const Size& rSizePixel) const
|
||||
Bitmap SgaObject::createPreviewBitmap(const Size& rSizePixel) const
|
||||
{
|
||||
BitmapEx aRetval;
|
||||
Bitmap aRetval;
|
||||
|
||||
if(rSizePixel.Width() && rSizePixel.Height())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user