1 files changed, 15 insertions, 10 deletions
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 6764c45f15fa..a351d820c872 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -100,15 +100,25 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, bool bOne_, const SfxIte
     CreateOutputItemSet( pSet ? *pSet->GetPool() : SfxGetpApp()->GetPool() );
 }
 
-
-
 SvxCharacterMap::~SvxCharacterMap()
 {
+    disposeOnce();
 }
 
-
-
-
+void SvxCharacterMap::dispose()
+{
+    m_pShowSet.clear();
+    m_pShowText.clear();
+    m_pOKBtn.clear();
+    m_pFontText.clear();
+    m_pFontLB.clear();
+    m_pSubsetText.clear();
+    m_pSubsetLB.clear();
+    m_pSymbolText.clear();
+    m_pShowChar.clear();
+    m_pCharCodeText.clear();
+    SfxModalDialog::dispose();
+}
 
 
 void SvxCharacterMap::SetChar( sal_UCS4 c )
@@ -174,8 +184,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxShowText(vcl::Windo
     return new SvxShowText(pParent);
 }
 
-
-
 void SvxShowText::Paint( const Rectangle& )
 {
     Color aTextCol = GetTextColor();
@@ -298,9 +306,6 @@ void SvxShowText::SetText( const OUString& rText )
 
 
 
-SvxShowText::~SvxShowText()
-{}
-
 // class SvxCharacterMap =================================================
 
 void SvxCharacterMap::init()