[Libreoffice-commits] core.git: Branch 'private/hcvcastro/preinit' - vcl/source

[Henry Castro]

 vcl/source/app/svdata.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7ddc979db233935ee8095c54670391944946cf6d
Author: Henry Castro <hcastro at collabora.com>
Date:   Mon Sep 7 17:48:38 2015 -0400

    vcl: more, assign NULL after delete
    
    Change-Id: I65ecfc2d2694a981ec2986988efabdfd28d0cce4

diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 14cf94d..94c23db 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -102,10 +102,10 @@ void ImplDeInitSVData()
 
     // delete global instance data
     if( pSVData->mpSettingsConfigItem )
-        delete pSVData->mpSettingsConfigItem;
+        delete pSVData->mpSettingsConfigItem, pSVData->mpSettingsConfigItem = NULL;
 
     if( pSVData->mpDockingManager )
-        delete pSVData->mpDockingManager;
+        delete pSVData->mpDockingManager, pSVData->mpDockingManager = NULL;
 
     if( pSVData->maCtrlData.mpFieldUnitStrings )
         delete pSVData->maCtrlData.mpFieldUnitStrings, pSVData->maCtrlData.mpFieldUnitStrings = NULL;