Kaydet (Commit) a93c08e8 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Caolán McNamara

svx: add result of "badstatics" plugin to fix abuse of VCL Bitmaps

VCL Image/Bitmap/BitmapEx instances must not have static life-time
because then they will be destructed after DeInitVCL() and that
likely segfaults.

(cherry picked from commit bf18f1b3)

Omitting the plugin itself, the fixes should be enough for release
branch.

Change-Id: I3ff8d32de729c971b190028094cb4efe206395e2
Reviewed-on: https://gerrit.libreoffice.org/19742Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f4b8ebbd
......@@ -156,14 +156,8 @@ TYPEINIT1(FmFormItem, FmParentData);
Image FmFormItem::GetImage() const
{
static Image aImage;
if (!aImage)
{
ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
aImage = aNavigatorImages.GetImage( RID_SVXIMG_FORM );
}
return aImage;
return aNavigatorImages.GetImage( RID_SVXIMG_FORM );
}
......@@ -187,14 +181,8 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co
Image FmFilterItems::GetImage() const
{
static Image aImage;
if (!aImage)
{
ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
aImage = aNavigatorImages.GetImage( RID_SVXIMG_FILTER );
}
return aImage;
return aNavigatorImages.GetImage( RID_SVXIMG_FILTER );
}
......@@ -213,14 +201,8 @@ FmFilterItem::FmFilterItem( FmFilterItems* pParent,
Image FmFilterItem::GetImage() const
{
static Image aImage;
if (!aImage)
{
ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) );
aImage = aNavigatorImages.GetImage( RID_SVXIMG_FIELD );
}
return aImage;
return aNavigatorImages.GetImage( RID_SVXIMG_FIELD );
}
......
......@@ -649,7 +649,7 @@ public:
// be done with a shader / gradient
static void SimulateBorderStretch(OutputDevice &rDev, const Rectangle& r)
{
static BitmapEx aPageShadowMask("sw/res/page-shadow-mask.png");
BitmapEx aPageShadowMask("sw/res/page-shadow-mask.png");
BitmapEx aRight(aPageShadowMask);
sal_Int32 nSlice = (aPageShadowMask.GetSizePixel().Width() - 3) / 4;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment