diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-12 22:02:20 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-11-16 18:50:16 +0100 |
| commit | 80b682362b51453e39f6bad2f809f3e551710dd3 (patch) | |
| tree | 9ce35009c45d544eee8e176c268cc24602b7010a /svx | |
| parent | 676fb8497383758e8f8730841d83d5a24e214629 (diff) | |
svx: loplugin:badstatics
(cherry picked from commit d5016b013672056f89f908b6cde38183fad145bb)
Change-Id: Ief31d8153fdbf91cdd29df5ac7801bd88a98542e
Reviewed-on: https://gerrit.libreoffice.org/19955
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d11d0915730f5eefda3f610a9e2c549a39cf655d)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdhdl.cxx | 5 | ||||
| -rw-r--r-- | svx/source/xoutdev/xtabcolr.cxx | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index c007892e64cc..93ea7df54d4d 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -2252,10 +2252,7 @@ SdrCropHdl::SdrCropHdl( BitmapEx SdrCropHdl::GetHandlesBitmap() { - static BitmapEx* pModernBitmap = 0; - if( pModernBitmap == 0 ) - pModernBitmap = new BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr())); - return *pModernBitmap; + return BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr())); } diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index da2f0b3c4658..c0d911bdefe0 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -36,7 +36,7 @@ XColorListRef XColorList::CreateStdColorList() XColorListRef XColorList::GetStdColorList() { - static XColorListRef aTable( CreateStdColorList() ); + XColorListRef aTable( CreateStdColorList() ); return aTable; } |