mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#85478 Avoid destroying bitmaps after VCL is shut down

Browse Source 
Change-Id: I1ece738e7f60b6bbbdc802339f8b9deec9396e1b
Reviewed-on: https://gerrit.libreoffice.org/12469
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Matthew J. Francis
2014-11-16 10:26:18 +08:00
committed by Caolán McNamara
parent 0843ade74e
commit e43f692ef9
2 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sfx2/recentdocsviewitem.hxx
View File

@@ -49,6 +49,10 @@ private:
/// Is the icon that the user can click to remove the document from the recent documents highlighted? /// Is the icon that the user can click to remove the document from the recent documents highlighted?
bool m_bRemoveIconHighlighted; bool m_bRemoveIconHighlighted;
BitmapEx m_aRemoveRecentBitmap;
BitmapEx m_aRemoveRecentBitmapHighlighted;
}; };
#endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX #endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX

28
sfx2/source/control/recentdocsviewitem.cxx
View File

@@ -30,31 +30,13 @@ using namespace com::sun::star::uno;
using namespace drawinglayer::primitive2d; using namespace drawinglayer::primitive2d;
using namespace drawinglayer::processor2d; using namespace drawinglayer::processor2d;
/// Icon that the user can click to remove the document from the recent documents.
struct theRemoveRecentBitmap : public rtl::StaticWithInit<BitmapEx, theRemoveRecentBitmap>
{
BitmapEx operator()()
{
return SfxResId(IMG_RECENTDOC_REMOVE);
}
};
/// Highlighted version of icon that the user can click to remove the document from the recent documents.
struct theRemoveRecentBitmapHighlighted : public rtl::StaticWithInit<BitmapEx, theRemoveRecentBitmapHighlighted>
{
BitmapEx operator()()
{
return SfxResId(IMG_RECENTDOC_REMOVE_HIGHLIGHTED);
}
};
RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rURL, RecentDocsViewItem::RecentDocsViewItem(ThumbnailView &rView, const OUString &rURL,
const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId) const OUString &rTitle, const BitmapEx &rThumbnail, sal_uInt16 nId)
: ThumbnailViewItem(rView, nId), : ThumbnailViewItem(rView, nId),
maURL(rURL), maURL(rURL),
m_bRemoveIconHighlighted(false) m_bRemoveIconHighlighted(false),
m_aRemoveRecentBitmap(SfxResId(IMG_RECENTDOC_REMOVE)),
m_aRemoveRecentBitmapHighlighted(SfxResId(IMG_RECENTDOC_REMOVE_HIGHLIGHTED))
{ {
OUString aTitle(rTitle); OUString aTitle(rTitle);
INetURLObject aURLObj(rURL); INetURLObject aURLObj(rURL);
@@ -151,7 +133,7 @@ Rectangle RecentDocsViewItem::updateHighlight(bool bVisible, const Point& rPoint
Rectangle RecentDocsViewItem::getRemoveIconArea() const Rectangle RecentDocsViewItem::getRemoveIconArea() const
{ {
Rectangle aArea(getDrawArea()); Rectangle aArea(getDrawArea());
Size aSize(theRemoveRecentBitmap::get().GetSizePixel()); Size aSize(m_aRemoveRecentBitmap.GetSizePixel());
return Rectangle( return Rectangle(
Point(aArea.Right() - aSize.Width() - THUMBNAILVIEW_ITEM_CORNER, aArea.Top() + THUMBNAILVIEW_ITEM_CORNER), Point(aArea.Right() - aSize.Width() - THUMBNAILVIEW_ITEM_CORNER, aArea.Top() + THUMBNAILVIEW_ITEM_CORNER),
@@ -175,7 +157,7 @@ void RecentDocsViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProc
Point aIconPos(getRemoveIconArea().TopLeft()); Point aIconPos(getRemoveIconArea().TopLeft());
aSeq[0] = drawinglayer::primitive2d::Primitive2DReference(new DiscreteBitmapPrimitive2D( aSeq[0] = drawinglayer::primitive2d::Primitive2DReference(new DiscreteBitmapPrimitive2D(
m_bRemoveIconHighlighted? theRemoveRecentBitmapHighlighted::get(): theRemoveRecentBitmap::get(), m_bRemoveIconHighlighted ? m_aRemoveRecentBitmapHighlighted : m_aRemoveRecentBitmap,
B2DPoint(aIconPos.X(), aIconPos.Y()))); B2DPoint(aIconPos.X(), aIconPos.Y())));
pProcessor->process(aSeq); pProcessor->process(aSeq);