1 files changed, 14 insertions, 3 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index fb86522b68c3..2da233a22696 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -97,7 +97,7 @@ IMPL_LINK( ConditionField, OnFormula, Button*, _pClickedButton )
 class OColorPopup : public FloatingWindow
 {
     DECL_LINK( SelectHdl, void * );
-    Condition*      m_pCondition;
+    VclPtr<Condition>      m_pCondition;
     sal_uInt16      m_nSlotId;
 public:
     OColorPopup(vcl::Window* _pParent,Condition* _pCondition);
@@ -161,8 +161,9 @@ OColorPopup::~OColorPopup()
 
 void OColorPopup::dispose()
 {
-    m_aColorSet.disposeAndClear();
     disposeBuilder();
+    m_aColorSet.clear();
+    m_pCondition.clear();
     FloatingWindow::dispose();
 }
 
@@ -315,11 +316,21 @@ void Condition::dispose()
 {
     m_bInDestruction = true;
 
-    delete m_pColorFloat;
     delete m_pBtnUpdaterFontColor;
     delete m_pCondLHS;
     delete m_pCondRHS;
     delete m_pBtnUpdaterBackgroundColor;
+    m_pHeader.clear();
+    m_pConditionType.clear();
+    m_pOperationList.clear();
+    m_pOperandGlue.clear();
+    m_pActions.clear();
+    m_pPreview.clear();
+    m_pMoveUp.clear();
+    m_pMoveDown.clear();
+    m_pAddCondition.clear();
+    m_pRemoveCondition.clear();
+    m_pColorFloat.clear();
     VclHBox::dispose();
 }