Merge remote-tracking branch 'origin/feature/vclptr'

Resolve several thousand lines of conflicts.

Conflicts:
	accessibility/source/extended/accessiblelistbox.cxx
	accessibility/source/standard/vclxaccessiblecombobox.cxx
	accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
	accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
	accessibility/source/standard/vclxaccessiblelistbox.cxx
	accessibility/source/standard/vclxaccessibletextfield.cxx
	basctl/source/basicide/basidesh.cxx
	cui/source/inc/chardlg.hxx
	cui/source/tabpages/tpbitmap.cxx
	dbaccess/source/ui/dlg/UserAdmin.cxx
	dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
	extensions/source/propctrlr/propertyeditor.hxx
	extensions/source/scanner/sanedlg.cxx
	filter/source/pdf/impdialog.cxx
	include/sfx2/mgetempl.hxx
	include/sfx2/sidebar/SidebarToolBox.hxx
	include/sfx2/viewsh.hxx
	include/svtools/brwbox.hxx
	include/svtools/filectrl.hxx
	include/svtools/scrwin.hxx
	include/svx/dlgctrl.hxx
	include/svx/sidebar/Popup.hxx
	include/svx/sidebar/PopupContainer.hxx
	include/svx/sidebar/PopupControl.hxx
	include/svx/sidebar/SidebarDialControl.hxx
	include/svx/sidebar/ValueSetWithTextControl.hxx
	sc/source/ui/condformat/condformatdlgentry.cxx
	sc/source/ui/navipi/navipi.cxx
	sc/source/ui/sidebar/CellBorderStyleControl.hxx
	sd/source/ui/animations/CustomAnimationDialog.cxx
	sd/source/ui/inc/DrawViewShell.hxx
	sd/source/ui/inc/Ruler.hxx
	sd/source/ui/inc/SlideSorter.hxx
	sd/source/ui/inc/ViewTabBar.hxx
	sd/source/ui/inc/Window.hxx
	sd/source/ui/inc/morphdlg.hxx
	sd/source/ui/inc/sdpreslt.hxx
	sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
	sd/source/ui/sidebar/LayoutMenu.hxx
	sd/source/ui/sidebar/MasterPagesSelector.hxx
	sd/source/ui/sidebar/NavigatorWrapper.hxx
	sd/source/ui/sidebar/PanelBase.hxx
	sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
	sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
	sd/source/ui/slideshow/showwindow.hxx
	sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
	sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx
	sd/source/ui/view/ViewShellBase.cxx
	sd/source/ui/view/drviewsa.cxx
	sfx2/source/appl/fileobj.hxx
	sfx2/source/appl/opengrf.cxx
	sfx2/source/control/thumbnailviewacc.hxx
	sfx2/source/dialog/securitypage.cxx
	sfx2/source/dialog/templdlg.cxx
	sfx2/source/doc/docinsert.cxx
	sfx2/source/doc/guisaveas.cxx
	sfx2/source/inc/alienwarn.hxx
	sfx2/source/sidebar/Deck.cxx
	sfx2/source/sidebar/Deck.hxx
	sfx2/source/sidebar/DeckTitleBar.cxx
	sfx2/source/sidebar/DeckTitleBar.hxx
	sfx2/source/sidebar/MenuButton.cxx
	sfx2/source/sidebar/MenuButton.hxx
	sfx2/source/sidebar/Panel.cxx
	sfx2/source/sidebar/Panel.hxx
	sfx2/source/sidebar/PanelTitleBar.hxx
	sfx2/source/sidebar/SidebarDockingWindow.hxx
	sfx2/source/sidebar/SidebarToolBox.cxx
	sfx2/source/sidebar/TabBar.hxx
	sfx2/source/sidebar/TabItem.cxx
	sfx2/source/sidebar/TabItem.hxx
	sfx2/source/sidebar/TitleBar.hxx
	sfx2/source/toolbox/imgmgr.cxx
	starmath/inc/edit.hxx
	starmath/inc/smmod.hxx
	starmath/qa/cppunit/test_starmath.cxx
	starmath/source/edit.cxx
	starmath/source/smmod.cxx
	svtools/source/brwbox/brwbox1.cxx
	svtools/source/brwbox/datwin.hxx
	svtools/source/contnr/fileview.cxx
	svtools/source/contnr/simptabl.cxx
	svtools/source/control/filectrl.cxx
	svtools/source/control/valueimp.hxx
	svx/inc/GalleryControl.hxx
	svx/source/dialog/dlgctrl.cxx
	svx/source/dialog/swframeexample.cxx
	svx/source/fmcomp/fmgridif.cxx
	svx/source/gallery2/GalleryControl.cxx
	svx/source/sidebar/EmptyPanel.hxx
	svx/source/sidebar/area/AreaPropertyPanel.hxx
	svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
	svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
	svx/source/sidebar/insert/InsertPropertyPanel.cxx
	svx/source/sidebar/insert/InsertPropertyPanel.hxx
	svx/source/sidebar/line/LinePropertyPanel.hxx
	svx/source/sidebar/line/LineWidthControl.cxx
	svx/source/sidebar/line/LineWidthControl.hxx
	svx/source/sidebar/line/LineWidthValueSet.hxx
	svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
	svx/source/sidebar/possize/SidebarDialControl.cxx
	svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
	svx/source/sidebar/text/TextPropertyPanel.hxx
	svx/source/sidebar/tools/PopupContainer.cxx
	svx/source/sidebar/tools/PopupControl.cxx
	svx/source/sidebar/tools/ValueSetWithTextControl.cxx
	svx/source/svdraw/svdfmtf.hxx
	svx/source/svdraw/svdibrow.cxx
	svx/source/tbxctrls/colrctrl.cxx
	svx/source/tbxctrls/tbcontrl.cxx
	sw/source/ui/dbui/mmaddressblockpage.cxx
	sw/source/ui/dialog/uiregionsw.cxx
	sw/source/ui/index/cnttab.cxx
	sw/source/uibase/inc/drpcps.hxx
	sw/source/uibase/sidebar/PageColumnControl.hxx
	sw/source/uibase/sidebar/PageMarginControl.hxx
	sw/source/uibase/sidebar/PageOrientationControl.hxx
	sw/source/uibase/sidebar/PagePropertyPanel.hxx
	sw/source/uibase/sidebar/PageSizeControl.hxx
	sw/source/uibase/uiview/view2.cxx
	sw/source/uibase/utlui/navipi.cxx
	vcl/inc/svdata.hxx
	vcl/source/control/combobox.cxx
	vcl/source/control/lstbox.cxx
	vcl/source/window/dockwin.cxx
	vcl/source/window/winproc.cxx

Change-Id: I056cf3026ff17d65cca0b6e6588bda4a88fa8d95

8 files changed, 132 insertions, 108 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 96dcfd61014d..c29d85ca1a87 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -96,7 +96,7 @@ class SmElementsControl : public Control
     SmElementList maElementList;
     Size          maMaxElementDimensions;
     bool          mbVerticalMode;
-    std::unique_ptr<ScrollBar> mxScroll;
+    VclPtr< ScrollBar > mxScroll;
 
     void addElement(const OUString& aElementVisual, const OUString& aElementSource, const OUString& aHelpText);
 
@@ -109,6 +109,7 @@ class SmElementsControl : public Control
 public:
     SmElementsControl(vcl::Window *pParent);
     virtual ~SmElementsControl();
+    virtual void dispose() SAL_OVERRIDE;
 
     void setElementSetId(sal_uInt16 aSetId);
 
@@ -126,8 +127,8 @@ class SmElementsDockingWindow : public SfxDockingWindow
 {
     static const sal_uInt16 aCategories[];
 
-    SmElementsControl*  mpElementsControl;
-    ListBox*            mpElementListBox;
+    VclPtr<SmElementsControl>  mpElementsControl;
+    VclPtr<ListBox>            mpElementListBox;
 
     virtual void Resize() SAL_OVERRIDE;
     SmViewShell* GetView();
@@ -141,6 +142,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..8093b9be3d5c 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -52,15 +52,15 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont);
 
 class SmPrintOptionsTabPage : public SfxTabPage
 {
-    CheckBox*       m_pTitle;
-    CheckBox*       m_pText;
-    CheckBox*       m_pFrame;
-    RadioButton*    m_pSizeNormal;
-    RadioButton*    m_pSizeScaled;
-    RadioButton*    m_pSizeZoomed;
-    MetricField*    m_pZoom;
-    CheckBox*       m_pNoRightSpaces;
-    CheckBox*       m_pSaveOnlyUsedSymbols;
+    VclPtr<CheckBox>       m_pTitle;
+    VclPtr<CheckBox>       m_pText;
+    VclPtr<CheckBox>       m_pFrame;
+    VclPtr<RadioButton>    m_pSizeNormal;
+    VclPtr<RadioButton>    m_pSizeScaled;
+    VclPtr<RadioButton>    m_pSizeZoomed;
+    VclPtr<MetricField>    m_pZoom;
+    VclPtr<CheckBox>       m_pNoRightSpaces;
+    VclPtr<CheckBox>       m_pSaveOnlyUsedSymbols;
 
     DECL_LINK(SizeButtonClickHdl, Button *);
 
@@ -68,9 +68,11 @@ class SmPrintOptionsTabPage : public SfxTabPage
     virtual void    Reset(const SfxItemSet* rSet) SAL_OVERRIDE;
 
 public:
-    static SfxTabPage* Create(vcl::Window *pWindow, const SfxItemSet &rSet);
+    static VclPtr<SfxTabPage> Create(vcl::Window *pWindow, const SfxItemSet &rSet);
 
     SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions);
+    virtual ~SmPrintOptionsTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 };
 
 /**************************************************************************/
@@ -90,11 +92,11 @@ public:
 
 class SmFontDialog : public ModalDialog
 {
-    ComboBox*       m_pFontBox;
-    VclContainer*   m_pAttrFrame;
-    CheckBox*       m_pBoldCheckBox;
-    CheckBox*       m_pItalicCheckBox;
-    SmShowFont*     m_pShowFont;
+    VclPtr<ComboBox>       m_pFontBox;
+    VclPtr<VclContainer>   m_pAttrFrame;
+    VclPtr<CheckBox>       m_pBoldCheckBox;
+    VclPtr<CheckBox>       m_pItalicCheckBox;
+    VclPtr<SmShowFont>     m_pShowFont;
 
     vcl::Font       Face;
 
@@ -108,6 +110,8 @@ class SmFontDialog : public ModalDialog
 
 public:
     SmFontDialog(vcl::Window * pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes);
+    virtual ~SmFontDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     const vcl::Font& GetFont() const { return Face; }
     void        SetFont(const vcl::Font &rFont);
@@ -117,18 +121,20 @@ public:
 
 class SmFontSizeDialog : public ModalDialog
 {
-    MetricField* m_pBaseSize;
-    MetricField* m_pTextSize;
-    MetricField* m_pIndexSize;
-    MetricField* m_pFunctionSize;
-    MetricField* m_pOperatorSize;
-    MetricField* m_pBorderSize;
-    PushButton* m_pDefaultButton;
+    VclPtr<MetricField> m_pBaseSize;
+    VclPtr<MetricField> m_pTextSize;
+    VclPtr<MetricField> m_pIndexSize;
+    VclPtr<MetricField> m_pFunctionSize;
+    VclPtr<MetricField> m_pOperatorSize;
+    VclPtr<MetricField> m_pBorderSize;
+    VclPtr<PushButton> m_pDefaultButton;
 
     DECL_LINK(DefaultButtonClickHdl, Button *);
 
 public:
     SmFontSizeDialog(vcl::Window *pParent);
+    virtual ~SmFontSizeDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -138,17 +144,17 @@ public:
 
 class SmFontTypeDialog : public ModalDialog
 {
-    SmFontPickListBox* m_pVariableFont;
-    SmFontPickListBox* m_pFunctionFont;
-    SmFontPickListBox* m_pNumberFont;
-    SmFontPickListBox* m_pTextFont;
-    SmFontPickListBox* m_pSerifFont;
-    SmFontPickListBox* m_pSansFont;
-    SmFontPickListBox* m_pFixedFont;
-    MenuButton* m_pMenuButton;
-    PushButton* m_pDefaultButton;
-
-    OutputDevice       *pFontListDev;
+    VclPtr<SmFontPickListBox> m_pVariableFont;
+    VclPtr<SmFontPickListBox> m_pFunctionFont;
+    VclPtr<SmFontPickListBox> m_pNumberFont;
+    VclPtr<SmFontPickListBox> m_pTextFont;
+    VclPtr<SmFontPickListBox> m_pSerifFont;
+    VclPtr<SmFontPickListBox> m_pSansFont;
+    VclPtr<SmFontPickListBox> m_pFixedFont;
+    VclPtr<MenuButton> m_pMenuButton;
+    VclPtr<PushButton> m_pDefaultButton;
+
+    VclPtr<OutputDevice> pFontListDev;
 
     DECL_LINK(MenuSelectHdl, Menu *);
     DECL_LINK(DefaultButtonClickHdl, Button *);
@@ -156,6 +162,8 @@ class SmFontTypeDialog : public ModalDialog
 
 public:
     SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice);
+    virtual ~SmFontTypeDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -194,19 +202,19 @@ public:
 
 class SmDistanceDialog : public ModalDialog
 {
-    VclFrame*       m_pFrame;
-    FixedText*      m_pFixedText1;
-    MetricField*    m_pMetricField1;
-    FixedText*      m_pFixedText2;
-    MetricField*    m_pMetricField2;
-    FixedText*      m_pFixedText3;
-    MetricField*    m_pMetricField3;
-    CheckBox*       m_pCheckBox1;
-    FixedText*      m_pFixedText4;
-    MetricField*    m_pMetricField4;
-    MenuButton*     m_pMenuButton;
-    PushButton*     m_pDefaultButton;
-    FixedImage*     m_pBitmap;
+    VclPtr<VclFrame>       m_pFrame;
+    VclPtr<FixedText>      m_pFixedText1;
+    VclPtr<MetricField>    m_pMetricField1;
+    VclPtr<FixedText>      m_pFixedText2;
+    VclPtr<MetricField>    m_pMetricField2;
+    VclPtr<FixedText>      m_pFixedText3;
+    VclPtr<MetricField>    m_pMetricField3;
+    VclPtr<CheckBox>       m_pCheckBox1;
+    VclPtr<FixedText>      m_pFixedText4;
+    VclPtr<MetricField>    m_pMetricField4;
+    VclPtr<MenuButton>     m_pMenuButton;
+    VclPtr<PushButton>     m_pDefaultButton;
+    VclPtr<FixedImage>     m_pBitmap;
 
     SmCategoryDesc *Categories[NOCATEGORIES];
     sal_uInt16          nActiveCategory;
@@ -224,6 +232,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*/;
@@ -238,15 +247,17 @@ public:
 
 class SmAlignDialog : public ModalDialog
 {
-    RadioButton* m_pLeft;
-    RadioButton* m_pCenter;
-    RadioButton* m_pRight;
-    PushButton*  m_pDefaultButton;
+    VclPtr<RadioButton> m_pLeft;
+    VclPtr<RadioButton> m_pCenter;
+    VclPtr<RadioButton> m_pRight;
+    VclPtr<PushButton>  m_pDefaultButton;
 
     DECL_LINK(DefaultButtonClickHdl, Button *);
 
 public:
     SmAlignDialog(vcl::Window *pParent);
+    virtual ~SmAlignDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void ReadFrom(const SmFormat &rFormat);
     void WriteTo (SmFormat &rFormat) const;
@@ -256,7 +267,7 @@ public:
 
 class SmShowSymbolSetWindow : public Control
 {
-    ScrollBar*  m_pVScrollBar;
+    VclPtr<ScrollBar>  m_pVScrollBar;
     SymbolPtrVec_t aSymbolSet;
     Link        aSelectHdlLink;
     Link        aDblClickHdlLink;
@@ -277,6 +288,8 @@ class SmShowSymbolSetWindow : public Control
     DECL_LINK( ScrollHdl, ScrollBar* );
 public:
     SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle);
+    virtual ~SmShowSymbolSetWindow();
+    virtual void dispose() SAL_OVERRIDE;
     void setScrollbar(ScrollBar *pVScrollBar);
     void calccols();
     void    SelectSymbol(sal_uInt16 nSymbol);
@@ -288,19 +301,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); }
 };
 
 
@@ -331,12 +346,12 @@ class SmSymDefineDialog;
 
 class SmSymbolDialog : public ModalDialog
 {
-    ListBox*         m_pSymbolSets;
-    SmShowSymbolSet* m_pSymbolSetDisplay;
-    FixedText*       m_pSymbolName;
-    SmShowSymbol*    m_pSymbolDisplay;
-    PushButton*      m_pGetBtn;
-    PushButton*      m_pEditBtn;
+    VclPtr<ListBox>         m_pSymbolSets;
+    VclPtr<SmShowSymbolSet> m_pSymbolSetDisplay;
+    VclPtr<FixedText>       m_pSymbolName;
+    VclPtr<SmShowSymbol>    m_pSymbolDisplay;
+    VclPtr<PushButton>      m_pGetBtn;
+    VclPtr<PushButton>      m_pEditBtn;
 
     SmViewShell        &rViewSh;
     SmSymbolManager    &rSymbolMgr;
@@ -344,7 +359,7 @@ class SmSymbolDialog : public ModalDialog
     OUString       aSymbolSetName;
     SymbolPtrVec_t      aSymbolSet;
 
-    OutputDevice       *pFontListDev;
+    VclPtr<OutputDevice> pFontListDev;
 
     DECL_LINK(SymbolSetChangeHdl, void*);
     DECL_LINK(SymbolChangeHdl, void*);
@@ -362,6 +377,8 @@ class SmSymbolDialog : public ModalDialog
 public:
     SmSymbolDialog(vcl::Window * pParent, OutputDevice *pFntListDevice,
             SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell);
+    virtual ~SmSymbolDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     bool    SelectSymbolSet(const OUString &rSymbolSetName);
     void    SelectSymbol(sal_uInt16 nSymbolPos);
@@ -389,23 +406,23 @@ public:
 
 class SmSymDefineDialog : public ModalDialog
 {
-    ComboBox*        pOldSymbols;
-    ComboBox*        pOldSymbolSets;
-    SvxShowCharSet*  pCharsetDisplay;
-    ComboBox*        pSymbols;
-    ComboBox*        pSymbolSets;
-    ListBox*         pFonts;
-    ListBox*         pFontsSubsetLB;
-    FontStyleBox*    pStyles;
-    FixedText*       pOldSymbolName;
-    SmShowChar*     pOldSymbolDisplay;
-    FixedText*       pOldSymbolSetName;
-    FixedText*       pSymbolName;
-    SmShowChar*     pSymbolDisplay;
-    FixedText*       pSymbolSetName;
-    PushButton*      pAddBtn;
-    PushButton*      pChangeBtn;
-    PushButton*      pDeleteBtn;
+    VclPtr<ComboBox>        pOldSymbols;
+    VclPtr<ComboBox>        pOldSymbolSets;
+    VclPtr<SvxShowCharSet>  pCharsetDisplay;
+    VclPtr<ComboBox>        pSymbols;
+    VclPtr<ComboBox>        pSymbolSets;
+    VclPtr<ListBox>         pFonts;
+    VclPtr<ListBox>         pFontsSubsetLB;
+    VclPtr<FontStyleBox>    pStyles;
+    VclPtr<FixedText>       pOldSymbolName;
+    VclPtr<SmShowChar>      pOldSymbolDisplay;
+    VclPtr<FixedText>       pOldSymbolSetName;
+    VclPtr<FixedText>       pSymbolName;
+    VclPtr<SmShowChar>      pSymbolDisplay;
+    VclPtr<FixedText>       pSymbolSetName;
+    VclPtr<PushButton>      pAddBtn;
+    VclPtr<PushButton>      pChangeBtn;
+    VclPtr<PushButton>      pDeleteBtn;
 
     SmSymbolManager     aSymbolMgrCopy,
                        &rSymbolMgr;
@@ -455,6 +472,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/document.hxx b/starmath/inc/document.hxx
index f439b135c26c..f12060490778 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -69,13 +69,13 @@ class EditEngine;
 
 class SmPrinterAccess
 {
-    Printer* pPrinter;
-    OutputDevice* pRefDev;
+    VclPtr<Printer> pPrinter;
+    VclPtr<OutputDevice> pRefDev;
 public:
     SmPrinterAccess( SmDocShell &rDocShell );
     ~SmPrinterAccess();
-    Printer* GetPrinter()  { return pPrinter; }
-    OutputDevice* GetRefDev()  { return pRefDev; }
+    Printer* GetPrinter()  { return pPrinter.get(); }
+    OutputDevice* GetRefDev()  { return pRefDev.get(); }
 };
 
 
@@ -98,8 +98,8 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
     SmNode             *pTree;
     SfxItemPool        *pEditEngineItemPool;
     EditEngine         *pEditEngine;
-    SfxPrinter         *pPrinter;       //q.v. comment to SmPrinter Access!
-    Printer            *pTmpPrinter;    //ditto
+    VclPtr<SfxPrinter>  pPrinter;       //q.v. comment to SmPrinter Access!
+    VclPtr<Printer>     pTmpPrinter;    //ditto
     sal_uInt16          nModifyCount;
     bool                bIsFormulaArranged;
     SmCursor           *pCursor;
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index dfb24e945c4f..17cea6de1857 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -55,9 +55,9 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
 
     SmCmdBoxWindow &rCmdBox;
     std::unique_ptr<EditView> pEditView;
-    std::unique_ptr<ScrollBar> pHScrollBar;
-    std::unique_ptr<ScrollBar> pVScrollBar;
-    std::unique_ptr<ScrollBarBox> pScrollBox;
+    VclPtr<ScrollBar>      pHScrollBar,
+                           pVScrollBar;
+    VclPtr<ScrollBarBox>   pScrollBox;
     Idle            aModifyIdle,
                     aCursorMoveIdle;
     ESelection      aOldSelection;
@@ -92,6 +92,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/smmod.hxx b/starmath/inc/smmod.hxx
index e324fe8fb15f..4b1c61c4e72c 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -91,7 +91,7 @@ class SmModule : public SfxModule, utl::ConfigurationListener
     std::unique_ptr<SmConfig> mpConfig;
     std::unique_ptr<SmLocalizedSymbolData> mpLocSymbolData;
     std::unique_ptr<SvtSysLocale> mpSysLocale;
-    std::unique_ptr<VirtualDevice> mpVirtualDev;
+    VclPtr<VirtualDevice>    mpVirtualDev;
 
     void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
 
@@ -125,7 +125,7 @@ public:
     //virtual methods for options dialog
     virtual SfxItemSet*  CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual void         ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) SAL_OVERRIDE;
-    virtual SfxTabPage*  CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual VclPtr<SfxTabPage> CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) SAL_OVERRIDE;
 };
 
 #define SM_MOD() ( *reinterpret_cast<SmModule**>(GetAppData(SHL_SM)) )
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index 472fe602c1a2..1af665e78954 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -32,7 +32,7 @@ class SmToolBoxWindow : public SfxFloatingWindow
 {
 
 protected:
-    ToolBox*    m_pToolBoxCat;
+    VclPtr<ToolBox>    m_pToolBoxCat;
     sal_uInt16  m_nUnbinopsId;
     sal_uInt16  m_nRelationsId;
     sal_uInt16  m_nSetoperationsId;
@@ -42,8 +42,8 @@ protected:
     sal_uInt16  m_nBracketsId;
     sal_uInt16  m_nFormatId;
     sal_uInt16  m_nMiscId;
-    ToolBox    *pToolBoxCmd;
-    ToolBox    *vToolBoxCategories[NUM_TBX_CATEGORIES];
+    VclPtr<ToolBox>    pToolBoxCmd;
+    VclPtr<ToolBox>    vToolBoxCategories[NUM_TBX_CATEGORIES];
     ImageList  *aImageLists [NUM_TBX_CATEGORIES + 1];   /* regular */
     sal_uInt16      nActiveCategoryRID;
 
@@ -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..52f6c1e1df37 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();
 };
 
@@ -214,7 +216,7 @@ public:
 
     SmEditWindow& GetEditWindow()
     {
-        return static_cast<SmCmdBoxWindow *>(pWindow)->GetEditWindow();
+        return static_cast<SmCmdBoxWindow *>(pWindow.get())->GetEditWindow();
     }
 
 };
@@ -231,7 +233,7 @@ class SmViewShell: public SfxViewShell
 
     std::unique_ptr<SmViewShell_Impl> pImpl;
 
-    SmGraphicWindow     aGraphic;
+    VclPtr<SmGraphicWindow>     aGraphic;
     SmGraphicController aGraphicController;
     OUString            aStatusText;
 
@@ -268,8 +270,8 @@ protected:
     void InsertFrom(SfxMedium &rMedium);
 
     virtual bool HasPrintOptionsPage() const SAL_OVERRIDE;
-    virtual SfxTabPage *CreatePrintOptionsPage(::vcl::Window    *pParent,
-                                               const SfxItemSet &rOptions) SAL_OVERRIDE;
+    virtual VclPtr<SfxTabPage> CreatePrintOptionsPage(::vcl::Window    *pParent,
+                                                      const SfxItemSet &rOptions) SAL_OVERRIDE;
     virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE;
     virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE;
     virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize) SAL_OVERRIDE;
@@ -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);
 
diff --git a/starmath/inc/visitors.hxx b/starmath/inc/visitors.hxx
index adbab3b5c091..bf5bb2edcdaa 100644
--- a/starmath/inc/visitors.hxx
+++ b/starmath/inc/visitors.hxx
@@ -149,7 +149,7 @@ public:
     }
 private:
     SmCaretLine line;
-    OutputDevice *pDev;
+    VclPtr<OutputDevice> pDev;
     SmCaretPos pos;
 protected:
     /** Default method for computing lines for pNodes */