[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source

[Michael Stahl]

 svx/source/svdraw/svdhdl.cxx    |    5 +----
 svx/source/xoutdev/xtabcolr.cxx |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit d11d0915730f5eefda3f610a9e2c549a39cf655d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 12 22:02:20 2015 +0100

    svx: loplugin:badstatics
    
    (cherry picked from commit d5016b013672056f89f908b6cde38183fad145bb)
    
    Change-Id: Ief31d8153fdbf91cdd29df5ac7801bd88a98542e
    Reviewed-on: https://gerrit.libreoffice.org/19955
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index c007892..93ea7df 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 da2f0b3..c0d911b 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;
 }