vcl: VclPtr conversion in svx.

Change-Id: I3a1000baa049b11728c46efbc2f0af0d8f34cf2b

Conflicts:
include/svx/charmap.hxx
include/svx/float3d.hxx
include/svx/fontwork.hxx
include/svx/galctrl.hxx
svx/inc/svdibrow.hxx
svx/source/dialog/dlgctl3d.cxx
svx/source/dialog/fontwork.cxx
svx/source/engine3d/float3d.cxx
svx/source/fmcomp/gridctrl.cxx
svx/source/gallery2/galbrws1.cxx
svx/source/inc/docrecovery.hxx

4 files changed, 14 insertions, 0 deletions

diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index da04cd6628dc..3cae7ead6f03 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -542,9 +542,15 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( vcl::Window* pParent )
 
 ChineseDictionaryDialog::~ChineseDictionaryDialog()
 {
+    dispose();
+}
+
+void ChineseDictionaryDialog::dispose()
+{
     m_xContext=0;
     delete m_pCT_DictionaryToSimplified;
     delete m_pCT_DictionaryToTraditional;
+    ModalDialog::dispose();
 }
 
 void ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirectionToSimplified, sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ )
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 97cef0a2ff33..6b50ef7b0397 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -113,6 +113,7 @@ class ChineseDictionaryDialog : public ModalDialog
 public:
     ChineseDictionaryDialog( vcl::Window* pParent );
     virtual ~ChineseDictionaryDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     //this method should be called once before calling execute
     void setDirectionAndTextConversionOptions( bool bDirectionToSimplified, sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ );
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 8dec51d66809..2253d3419749 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -63,12 +63,18 @@ ChineseTranslationDialog::ChineseTranslationDialog( vcl::Window* pParent )
 
 ChineseTranslationDialog::~ChineseTranslationDialog()
 {
+    dispose();
+}
+
+void ChineseTranslationDialog::dispose()
+{
     if(m_pDictionaryDialog)
     {
         if(m_pDictionaryDialog->IsInExecute())
             m_pDictionaryDialog->EndDialog();
         delete m_pDictionaryDialog;
     }
+    ModalDialog::dispose();
 }
 
 void ChineseTranslationDialog::getSettings( bool& rbDirectionToSimplified
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index 5e1f0909d9f2..6afeadf965c2 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -39,6 +39,7 @@ class ChineseTranslationDialog : public ModalDialog
 public:
     ChineseTranslationDialog( vcl::Window* pParent );
     virtual ~ChineseTranslationDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void getSettings( bool& rbDirectionToSimplified
                     , bool& rbTranslateCommonTerms ) const;