summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/accmgr.cxx6
-rw-r--r--vcl/source/window/brdwin.cxx6
-rw-r--r--vcl/source/window/msgbox.cxx3
-rw-r--r--vcl/source/window/splitwin.cxx3
-rw-r--r--vcl/source/window/tabdlg.cxx3
-rw-r--r--vcl/source/window/toolbox.cxx3
-rw-r--r--vcl/source/window/window.cxx12
7 files changed, 12 insertions, 24 deletions
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 43c78d55adc1..a14530abe47a 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -43,10 +43,8 @@ DBG_NAMEEX( Accelerator )
ImplAccelManager::~ImplAccelManager()
{
- if ( mpAccelList )
- delete mpAccelList;
- if ( mpSequenceList )
- delete mpSequenceList;
+ delete mpAccelList;
+ delete mpSequenceList;
}
// -----------------------------------------------------------------------
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index d048b3ab6fba..bf25f347b079 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1438,10 +1438,8 @@ ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindo
ImplStdBorderWindowView::~ImplStdBorderWindowView()
{
- if ( mpATitleVirDev )
- delete mpATitleVirDev;
- if ( mpDTitleVirDev )
- delete mpDTitleVirDev;
+ delete mpATitleVirDev;
+ delete mpDTitleVirDev;
}
// -----------------------------------------------------------------------
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index bc328326e5c2..4b4861aa65cd 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -258,8 +258,7 @@ void MessBox::ImplPosControls()
WinBits nWinStyle = WB_LEFT | WB_WORDBREAK | WB_NOLABEL | WB_INFO;
sal_uInt16 nTextStyle = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP | TEXT_DRAW_LEFT;
- if ( mpFixedText )
- delete mpFixedText;
+ delete mpFixedText;
if ( mpFixedImage )
{
delete mpFixedImage;
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index ed717f67be7c..8850e7d60951 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2621,8 +2621,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
if ( rTEvt.IsTrackingEnded() )
{
- if ( mpLastSizes )
- delete mpLastSizes;
+ delete mpLastSizes;
mpLastSizes = NULL;
mpSplitSet = NULL;
mnMouseOff = 0;
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 32e8a0dcec92..beb02a1dbc16 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -239,8 +239,7 @@ TabDialog::TabDialog( Window* pParent, const ResId& rResId ) :
TabDialog::~TabDialog()
{
- if ( mpFixedLine )
- delete mpFixedLine;
+ delete mpFixedLine;
}
// -----------------------------------------------------------------------
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 87347e829a56..13a56487340f 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1796,8 +1796,7 @@ ToolBox::~ToolBox()
delete mpData;
// FloatSizeAry gegebenenfalls loeschen
- if ( mpFloatSizeAry )
- delete mpFloatSizeAry;
+ delete mpFloatSizeAry;
// Wenn keine ToolBox-Referenzen mehr auf die Listen bestehen, dann
// Listen mit wegloeschen
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f64a3a6daecf..1dc681cac964 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1899,8 +1899,7 @@ sal_Bool Window::ImplSetClipFlagChilds( sal_Bool bSysObjOnlySmaller )
bUpdate = sal_False;
}
- if ( pOldRegion )
- delete pOldRegion;
+ delete pOldRegion;
}
else
{
@@ -2459,8 +2458,7 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
if( !aSelectionRect.IsEmpty() )
DrawSelectionBackground( aSelectionRect, 3, sal_False, sal_True, sal_False );
- if ( pChildRegion )
- delete pChildRegion;
+ delete pChildRegion;
}
// -----------------------------------------------------------------------
@@ -3469,10 +3467,8 @@ void Window::ImplPosSizeWindow( long nX, long nY,
mpWindowImpl->mpSysObj->SetPosSize( mnOutOffX, mnOutOffY, mnOutWidth, mnOutHeight );
}
- if ( pOverlapRegion )
- delete pOverlapRegion;
- if ( pOldRegion )
- delete pOldRegion;
+ delete pOverlapRegion;
+ delete pOldRegion;
}
// -----------------------------------------------------------------------