[Libreoffice-commits] core.git: sc/inc sfx2/source svl/source

Gabor Kelemen kelemeng at ubuntu.com
Mon May 14 06:00:40 UTC 2018


 sc/inc/global.hxx            |    4 ----
 sfx2/source/inc/sfxtypes.hxx |    4 ----
 svl/source/inc/poolio.hxx    |    4 ----
 3 files changed, 12 deletions(-)

New commits:
commit d9c2523b0c83d0d8cf5874e33f45e018a77aebe4
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Sun May 13 23:29:04 2018 +0200

    Drop module-specific defines of DELETEZ
    
    The one in tools/solar.h is the only one needed.
    
    Change-Id: I7a4e041694fb61329d16f300be4f986eb8d4ec48
    Reviewed-on: https://gerrit.libreoffice.org/54202
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 912164234597..bbdd26d9d38a 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -272,10 +272,6 @@ namespace o3tl
     template<> struct typed_flags<ScCloneFlags> : is_typed_flags<ScCloneFlags, 0x0007> {};
 }
 
-#ifndef DELETEZ
-#define DELETEZ(pPtr) { delete pPtr; pPtr = 0; }
-#endif
-
 enum CellType
     {
         CELLTYPE_NONE,
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index d731086ba5fd..6ee10ed0e41f 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -25,10 +25,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
-#ifndef DELETEZ
-#define DELETEZ(pPtr) ( delete pPtr, pPtr = 0 )
-#endif
-
 #if defined(DBG_UTIL)
 
 class SfxStack
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 359b88c863dd..59513517daba 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -30,10 +30,6 @@
 class SfxPoolItem;
 class SfxItemPoolUser;
 
-#ifndef DELETEZ
-#define DELETEZ(pPtr) { delete pPtr; pPtr = 0; }
-#endif
-
 static const sal_uInt32 SFX_ITEMS_DEFAULT = 0xfffffffe;
 
 /**


More information about the Libreoffice-commits mailing list