Fix unhelpful MI from a VclPtr type and Abstract factory type.

Change-Id: Ibd8a8e22ffe2cd01225e97588d65eae1cc0bffb8

1 files changed, 18 insertions, 16 deletions

diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index c412265abdbb..69bfd0ec0051 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -24,16 +24,27 @@
 #include "splitcelldlg.hxx"
 #include "cuires.hrc"
 
+namespace {
+    class NoApplyDialog : public SvxStandardDialog
+    {
+    public:
+        NoApplyDialog(vcl::Window *pParent, const OUString &rId, const OUString &rXML) :
+            SvxStandardDialog(pParent, rId, rXML) { }
+    protected:
+        virtual void Apply() SAL_OVERRIDE {}
+    };
+}
+
 SvxSplitTableDlg::SvxSplitTableDlg( vcl::Window *pParent, bool bIsTableVertical,
     long nMaxVertical, long nMaxHorizontal )
-    : SvxStandardDialog(pParent, "SplitCellsDialog", "cui/ui/splitcellsdialog.ui")
+    : m_pDialog(VclPtr<NoApplyDialog>::Create(pParent, "SplitCellsDialog", "cui/ui/splitcellsdialog.ui"))
     , mnMaxVertical(nMaxVertical)
     , mnMaxHorizontal(nMaxHorizontal)
 {
-    get(m_pCountEdit, "countnf");
-    get(m_pHorzBox, "hori");
-    get(m_pVertBox, "vert");
-    get(m_pPropCB, "prop");
+    m_pDialog->get(m_pCountEdit, "countnf");
+    m_pDialog->get(m_pHorzBox, "hori");
+    m_pDialog->get(m_pVertBox, "vert");
+    m_pDialog->get(m_pPropCB, "prop");
     m_pHorzBox->SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
     m_pPropCB->SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
     m_pVertBox->SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
@@ -55,16 +66,11 @@ SvxSplitTableDlg::SvxSplitTableDlg( vcl::Window *pParent, bool bIsTableVertical,
 
 SvxSplitTableDlg::~SvxSplitTableDlg()
 {
-    disposeOnce();
-}
-
-void SvxSplitTableDlg::dispose()
-{
     m_pCountEdit.clear();
     m_pHorzBox.clear();
     m_pVertBox.clear();
     m_pPropCB.clear();
-    SvxStandardDialog::dispose();
+    m_pDialog.disposeAndClear();
 }
 
 IMPL_LINK( SvxSplitTableDlg, ClickHdl, Button *, pButton )
@@ -93,11 +99,7 @@ long SvxSplitTableDlg::GetCount() const
 
 short SvxSplitTableDlg::Execute()
 {
-    return SvxStandardDialog::Execute();
-}
-
-void SvxSplitTableDlg::Apply()
-{
+    return m_pDialog->Execute();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */