summaryrefslogtreecommitdiff
path: root/vcl/win/source
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-11-07 12:49:03 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-07 12:49:03 +0000
commit2411ea09a8d20609e48b0750ab2102c00e0c3b8a (patch)
tree18c8dd0e5784ea488e2744067225689b85f8ed1f /vcl/win/source
parent2ea9da71470a9e2a442ec6a660de47691a3f8723 (diff)
redundant if not-null checks on delete
Diffstat (limited to 'vcl/win/source')
-rw-r--r--vcl/win/source/gdi/salgdi.cxx9
-rw-r--r--vcl/win/source/window/salobj.cxx3
2 files changed, 4 insertions, 8 deletions
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 3c0e828a87ca..ee347583393b 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -785,14 +785,11 @@ WinSalGraphics::~WinSalGraphics()
if ( mpStdClipRgnData )
delete [] mpStdClipRgnData;
- if ( mpLogFont )
- delete mpLogFont;
+ delete mpLogFont;
- if ( mpFontCharSets )
- delete mpFontCharSets;
+ delete mpFontCharSets;
- if ( mpFontKernPairs )
- delete mpFontKernPairs;
+ delete mpFontKernPairs;
}
// -----------------------------------------------------------------------
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index 0ee631d27d84..01ffd8b20652 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -654,8 +654,7 @@ WinSalObject::~WinSalObject()
}
// Cache-Daten zerstoeren
- if ( mpStdClipRgnData )
- delete mpStdClipRgnData;
+ delete mpStdClipRgnData;
HWND hWndParent = ::GetParent( mhWnd );