vcl: VclPtr conversion in starmath

Change-Id: I5d43afd893802db44d9d08d8acb64307c63b7eac

5 files changed, 21 insertions, 12 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 96dcfd61014d..bdb57ac37288 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -141,6 +141,7 @@ public:
                              SfxChildWindow* pChildWindow,
                              vcl::Window* pParent );
     virtual ~SmElementsDockingWindow();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void EndDocking( const Rectangle& rReactangle, bool bFloatMode) SAL_OVERRIDE;
     virtual void ToggleFloatingMode() SAL_OVERRIDE;
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 9c3987bb91fe..970edddd18e0 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -224,6 +224,7 @@ class SmDistanceDialog : public ModalDialog
 public:
     SmDistanceDialog(vcl::Window *pParent);
     virtual ~SmDistanceDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) /*const*/;
@@ -288,19 +289,21 @@ public:
 
 class SmShowSymbolSet : public VclHBox
 {
-    SmShowSymbolSetWindow aSymbolWindow;
-    ScrollBar   aVScrollBar;
+    VclPtr<SmShowSymbolSetWindow> aSymbolWindow;
+    VclPtr<ScrollBar>             aVScrollBar;
 
 public:
     SmShowSymbolSet(vcl::Window *pParent);
+    virtual ~SmShowSymbolSet();
+    virtual void dispose() SAL_OVERRIDE;
 
-    void    SetSymbolSet(const SymbolPtrVec_t& rSymbolSet) { aSymbolWindow.SetSymbolSet(rSymbolSet); }
+    void    SetSymbolSet(const SymbolPtrVec_t& rSymbolSet) { aSymbolWindow->SetSymbolSet(rSymbolSet); }
 
-    void    SelectSymbol(sal_uInt16 nSymbol) { aSymbolWindow.SelectSymbol(nSymbol); }
-    sal_uInt16  GetSelectSymbol() const { return aSymbolWindow.GetSelectSymbol(); }
+    void    SelectSymbol(sal_uInt16 nSymbol) { aSymbolWindow->SelectSymbol(nSymbol); }
+    sal_uInt16  GetSelectSymbol() const { return aSymbolWindow->GetSelectSymbol(); }
 
-    void SetSelectHdl(const Link& rLink)   { aSymbolWindow.SetSelectHdl(rLink); }
-    void SetDblClickHdl(const Link& rLink) { aSymbolWindow.SetDblClickHdl(rLink); }
+    void SetSelectHdl(const Link& rLink)   { aSymbolWindow->SetSelectHdl(rLink); }
+    void SetDblClickHdl(const Link& rLink) { aSymbolWindow->SetDblClickHdl(rLink); }
 };
 
 
@@ -455,6 +458,7 @@ class SmSymDefineDialog : public ModalDialog
 public:
     SmSymDefineDialog(vcl::Window *pParent, OutputDevice *pFntListDevice, SmSymbolManager &rMgr);
     virtual ~SmSymDefineDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     using OutputDevice::SetFont;
 
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 601b3b9a1667..2bd99c6c0465 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -91,6 +91,7 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
 public:
     SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin );
     virtual ~SmEditWindow();
+    virtual void         dispose() SAL_OVERRIDE;
 
     SmDocShell *    GetDoc();
     SmViewShell *   GetView();
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index 472fe602c1a2..3b3f697890f7 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -65,6 +65,7 @@ public:
                     SfxChildWindow *pChildWindow,
                     Window         *pParent);
     virtual ~SmToolBoxWindow();
+    virtual void dispose() SAL_OVERRIDE;
 
     // Window
     virtual void    StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 85bfbdb52194..8a1fdade04cf 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -95,6 +95,7 @@ private:
 public:
     SmGraphicWindow(SmViewShell* pShell);
     virtual ~SmGraphicWindow();
+    virtual void dispose() SAL_OVERRIDE;
 
     // Window
     virtual void    MouseButtonDown(const MouseEvent &rMEvt) SAL_OVERRIDE;
@@ -159,7 +160,7 @@ public:
 
 class SmCmdBoxWindow : public SfxDockingWindow
 {
-    SmEditWindow        aEdit;
+    VclPtr<SmEditWindow>        aEdit;
     SmEditController    aController;
     bool                bExiting;
 
@@ -187,10 +188,11 @@ public:
                    Window         *pParent);
 
     virtual ~SmCmdBoxWindow ();
+    virtual void dispose() SAL_OVERRIDE;
 
     void AdjustPosition();
 
-    SmEditWindow& GetEditWindow() { return aEdit; }
+    SmEditWindow& GetEditWindow() { return *aEdit.get(); }
     SmViewShell  *GetView();
 };
 
@@ -231,7 +233,7 @@ class SmViewShell: public SfxViewShell
 
     std::unique_ptr<SmViewShell_Impl> pImpl;
 
-    SmGraphicWindow     aGraphic;
+    VclPtr<SmGraphicWindow>     aGraphic;
     SmGraphicController aGraphicController;
     OUString            aStatusText;
 
@@ -290,8 +292,8 @@ public:
     }
 
     SmEditWindow * GetEditWindow();
-          SmGraphicWindow & GetGraphicWindow()       { return aGraphic; }
-    const SmGraphicWindow & GetGraphicWindow() const { return aGraphic; }
+          SmGraphicWindow & GetGraphicWindow()       { return *aGraphic.get(); }
+    const SmGraphicWindow & GetGraphicWindow() const { return *aGraphic.get(); }
 
     void        SetStatusText(const OUString& rText);