diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-10-30 16:05:42 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-02 16:39:19 +0100 |
| commit | bf18f1b3535dd17f9bf584cab15ee6a7fd431257 (patch) | |
| tree | cb6e4c720f93f614372fc0c2ed8336a8bda78ce5 /svx/source | |
| parent | bcd8da6849780b9680963ef3313d14209a46e5fa (diff) | |
compilerplugins: add "badstatics" to detect 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.
Change-Id: I3ff8d32de729c971b190028094cb4efe206395e2
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/form/filtnav.cxx | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 8bb80d37fd65..f33c0d195474 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -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; + ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); + 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; + ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); + 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; + ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); + return aNavigatorImages.GetImage( RID_SVXIMG_FIELD ); } |