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

6 files changed, 258 insertions, 198 deletions

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 282a72749611..d80c5097f7dd 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -91,6 +91,7 @@
 #include <unomid.h>
 
 #include "navmgr.hxx"
+#include "SidebarWin.hxx"
 #include <boost/scoped_ptr.hpp>
 
 #define CTYPE_CNT   0
@@ -836,8 +837,15 @@ SwContentTree::SwContentTree(vcl::Window* pParent, const ResId& rResId)
 
 SwContentTree::~SwContentTree()
 {
+    disposeOnce();
+}
+
+void SwContentTree::dispose()
+{
     Clear(); // If applicable erase content types previously.
     bIsInDrag = false;
+    aUpdTimer.Stop();
+    SvTreeListBox::dispose();
 }
 
 OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const
@@ -1594,11 +1602,11 @@ void SwContentTree::Display( bool bActive )
         bIsLastReadOnly = bReadOnly;
         bool bDisable =  pShell == 0 || bReadOnly;
         SwNavigationPI* pNavi = GetParentWindow();
-        pNavi->aContentToolBox.EnableItem(FN_ITEM_UP , !bDisable);
-        pNavi->aContentToolBox.EnableItem(FN_ITEM_DOWN, !bDisable);
-        pNavi->aContentToolBox.EnableItem(FN_ITEM_LEFT, !bDisable);
-        pNavi->aContentToolBox.EnableItem(FN_ITEM_RIGHT, !bDisable);
-        pNavi->aContentToolBox.EnableItem(FN_SELECT_SET_AUTO_BOOKMARK, !bDisable);
+        pNavi->aContentToolBox->EnableItem(FN_ITEM_UP , !bDisable);
+        pNavi->aContentToolBox->EnableItem(FN_ITEM_DOWN, !bDisable);
+        pNavi->aContentToolBox->EnableItem(FN_ITEM_LEFT, !bDisable);
+        pNavi->aContentToolBox->EnableItem(FN_ITEM_RIGHT, !bDisable);
+        pNavi->aContentToolBox->EnableItem(FN_SELECT_SET_AUTO_BOOKMARK, !bDisable);
     }
     if(pShell)
     {
@@ -1927,7 +1935,7 @@ bool SwContentTree::ToggleToRoot()
         }
     }
     pConfig->SetRootType( nRootType );
-    GetParentWindow()->aContentToolBox.CheckItem(FN_SHOW_ROOT, bIsRoot);
+    GetParentWindow()->aContentToolBox->CheckItem(FN_SHOW_ROOT, bIsRoot);
     return bIsRoot;
 }
 
@@ -2440,6 +2448,9 @@ void    SwContentTree::HideTree()
 
 IMPL_LINK_NOARG(SwContentTree, TimerUpdate)
 {
+    if (IsDisposed())
+        return 0;
+
     // No update while drag and drop.
     // Query view because the Navigator is cleared too late.
     SwView* pView = GetParentWindow()->GetCreateView();
@@ -3046,10 +3057,10 @@ bool SwContentTree::Select( SvTreeListEntry* pEntry, bool bSelect )
         }
     }
     SwNavigationPI* pNavi = GetParentWindow();
-    pNavi->aContentToolBox.EnableItem(FN_ITEM_UP ,  bEnable);
-    pNavi->aContentToolBox.EnableItem(FN_ITEM_DOWN, bEnable);
-    pNavi->aContentToolBox.EnableItem(FN_ITEM_LEFT, bEnable);
-    pNavi->aContentToolBox.EnableItem(FN_ITEM_RIGHT,bEnable);
+    pNavi->aContentToolBox->EnableItem(FN_ITEM_UP ,  bEnable);
+    pNavi->aContentToolBox->EnableItem(FN_ITEM_DOWN, bEnable);
+    pNavi->aContentToolBox->EnableItem(FN_ITEM_LEFT, bEnable);
+    pNavi->aContentToolBox->EnableItem(FN_ITEM_RIGHT,bEnable);
 
     return SvTreeListBox::Select(pEntry, bSelect);
 }
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 2f4b0a5009f6..5c5a1aa75d93 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -180,8 +180,18 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, const ResId& rResId) :
 
 SwGlobalTree::~SwGlobalTree()
 {
+    disposeOnce();
+}
+
+void SwGlobalTree::dispose()
+{
     delete pSwGlblDocContents;
+    pSwGlblDocContents = NULL;
     delete pDocInserter;
+    pDocInserter = NULL;
+    pDefParentWin.clear();
+    aUpdateTimer.Stop();
+    SvTreeListBox::dispose();
 }
 
 sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
@@ -505,12 +515,12 @@ void     SwGlobalTree::SelectHdl()
     SwNavigationPI* pNavi = GetParentWindow();
     bool bReadonly = !pActiveShell ||
                 pActiveShell->GetView().GetDocShell()->IsReadOnly();
-    pNavi->aGlobalToolBox.EnableItem(FN_GLOBAL_EDIT,  nSelCount == 1 && !bReadonly);
-    pNavi->aGlobalToolBox.EnableItem(FN_GLOBAL_OPEN,  nSelCount <= 1 && !bReadonly);
-    pNavi->aGlobalToolBox.EnableItem(FN_GLOBAL_UPDATE,  GetEntryCount() > 0 && !bReadonly);
-    pNavi->aGlobalToolBox.EnableItem(FN_ITEM_UP,
+    pNavi->aGlobalToolBox->EnableItem(FN_GLOBAL_EDIT,  nSelCount == 1 && !bReadonly);
+    pNavi->aGlobalToolBox->EnableItem(FN_GLOBAL_OPEN,  nSelCount <= 1 && !bReadonly);
+    pNavi->aGlobalToolBox->EnableItem(FN_GLOBAL_UPDATE,  GetEntryCount() > 0 && !bReadonly);
+    pNavi->aGlobalToolBox->EnableItem(FN_ITEM_UP,
                     nSelCount == 1 && nAbsPos && !bReadonly);
-    pNavi->aGlobalToolBox.EnableItem(FN_ITEM_DOWN,
+    pNavi->aGlobalToolBox->EnableItem(FN_ITEM_DOWN,
                     nSelCount == 1 && nAbsPos < GetEntryCount() - 1 && !bReadonly);
 
 }
@@ -1001,7 +1011,7 @@ void    SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
 
 IMPL_LINK_NOARG(SwGlobalTree, Timeout)
 {
-    if(!HasFocus() && Update( false ))
+    if(!IsDisposed() && !HasFocus() && Update( false ))
         Display();
     return 0;
 }
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 7f18c24ab564..53980635be55 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -51,14 +51,17 @@ struct TripleString
 
 class SwGlossDecideDlg : public ModalDialog
 {
-    OKButton* m_pOk;
-    ListBox*  m_pListLB;
+    VclPtr<OKButton> m_pOk;
+    VclPtr<ListBox>  m_pListLB;
 
     DECL_LINK(DoubleClickHdl, void*);
     DECL_LINK(SelectHdl, void*);
 
-    public:
-        SwGlossDecideDlg(vcl::Window* pParent);
+public:
+    SwGlossDecideDlg(vcl::Window* pParent);
+    virtual ~SwGlossDecideDlg();
+    virtual void dispose() SAL_OVERRIDE;
+
     ListBox&    GetListBox() {return *m_pListLB;}
 };
 
@@ -73,6 +76,18 @@ SwGlossDecideDlg::SwGlossDecideDlg(vcl::Window* pParent)
     m_pListLB->SetSelectHdl(LINK(this, SwGlossDecideDlg, SelectHdl));
 }
 
+SwGlossDecideDlg::~SwGlossDecideDlg()
+{
+    disposeOnce();
+}
+
+void SwGlossDecideDlg::dispose()
+{
+    m_pOk.clear();
+    m_pListLB.clear();
+    ModalDialog::dispose();
+}
+
 IMPL_LINK_NOARG(SwGlossDecideDlg, DoubleClickHdl)
 {
     EndDialog(RET_OK);
@@ -143,16 +158,16 @@ bool SwGlossaryList::GetShortName(const OUString& rLongName,
     }
     else if(1 < nCount)
     {
-        SwGlossDecideDlg aDlg(0);
-        OUString sTitle = aDlg.GetText() + " " + aTripleStrings.front().sBlock;
-        aDlg.SetText(sTitle);
+        ScopedVclPtrInstance< SwGlossDecideDlg > aDlg(nullptr);
+        OUString sTitle = aDlg->GetText() + " " + aTripleStrings.front().sBlock;
+        aDlg->SetText(sTitle);
 
-        ListBox& rLB = aDlg.GetListBox();
+        ListBox& rLB = aDlg->GetListBox();
         for(std::vector<TripleString>::const_iterator i = aTripleStrings.begin(); i != aTripleStrings.end(); ++i)
             rLB.InsertEntry(i->sGroup.getToken(0, GLOS_DELIM));
 
         rLB.SelectEntryPos(0);
-        if(RET_OK == aDlg.Execute() &&
+        if(RET_OK == aDlg->Execute() &&
             LISTBOX_ENTRY_NOTFOUND != rLB.GetSelectEntryPos())
         {
             const TripleString& pTriple(aTripleStrings[rLB.GetSelectEntryPos()]);
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 946d409c1e58..b23fbb88f3b3 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -135,13 +135,13 @@ IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox *, pBox )
     if(!pView)
     {
         nEntryIdx == 0 ?
-            aContentTree.ShowHiddenShell():
-                aContentTree.ShowActualView();
+            aContentTree->ShowHiddenShell():
+                aContentTree->ShowActualView();
 
     }
     else
     {
-        aContentTree.SetConstantShell(pView->GetWrtShellPtr());
+        aContentTree->SetConstantShell(pView->GetWrtShellPtr());
     }
     return 0;
 }
@@ -153,23 +153,23 @@ void SwNavigationPI::FillBox()
 {
     if(pContentWrtShell)
     {
-        aContentTree.SetHiddenShell( pContentWrtShell );
-        aContentTree.Display(  false );
+        aContentTree->SetHiddenShell( pContentWrtShell );
+        aContentTree->Display(  false );
     }
     else
     {
         SwView *pView = GetCreateView();
         if(!pView)
         {
-            aContentTree.SetActiveShell(0);
+            aContentTree->SetActiveShell(0);
         }
         else if( pView != pActContView)
         {
             SwWrtShell* pWrtShell = pView->GetWrtShellPtr();
-            aContentTree.SetActiveShell(pWrtShell);
+            aContentTree->SetActiveShell(pWrtShell);
         }
         else
-            aContentTree.Display( true );
+            aContentTree->Display( true );
         pActContView = pView;
     }
 }
@@ -222,7 +222,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
         break;
         case FN_SHOW_ROOT:
         {
-            aContentTree.ToggleToRoot();
+            aContentTree->ToggleToRoot();
         }
         break;
         case FN_SHOW_CONTENT_BOX:
@@ -305,9 +305,9 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
         case FN_GLOBAL_EDIT:
         {
             if(IsGlobalMode())
-                aGlobalTree.ExecCommand(nCurrItemId);
+                aGlobalTree->ExecCommand(nCurrItemId);
             else
-                aContentTree.ExecCommand(nCurrItemId, bOutlineWithChildren);
+                aContentTree->ExecCommand(nCurrItemId, bOutlineWithChildren);
         }
         break;
         case FN_GLOBAL_SWITCH:
@@ -343,7 +343,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxClickHdl, ToolBox *, pBox )
         case FN_GLOBAL_UPDATE:
         case FN_GLOBAL_OPEN:
         {
-            aGlobalTree.TbxMenuHdl(nCurrItemId, pBox);
+            aGlobalTree->TbxMenuHdl(nCurrItemId, pBox);
         }
         break;
     }
@@ -396,7 +396,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
                 pMenu->InsertItem( i, OUString::number(i - 100) );
                 pMenu->SetHelpId( i, HID_NAVI_OUTLINES );
             }
-            pMenu->CheckItem( aContentTree.GetOutlineLevel() + 100 );
+            pMenu->CheckItem( aContentTree->GetOutlineLevel() + 100 );
             pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl));
             pBox->SetItemDown( nCurrItemId, true );
             pMenu->Execute( pBox,
@@ -435,7 +435,7 @@ void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus
 
     Rectangle aRect(rRect);
     Point aT1 = aRect.TopLeft();
-    aT1 = pPopup->GetParent()->OutputToScreenPixel(pPopup->GetParent()->AbsoluteScreenToOutputPixel(aContentToolBox.OutputToAbsoluteScreenPixel(aT1)));
+    aT1 = pPopup->GetParent()->OutputToScreenPixel(pPopup->GetParent()->AbsoluteScreenToOutputPixel(aContentToolBox->OutputToAbsoluteScreenPixel(aT1)));
     aRect.SetPos(aT1);
     pPopup->StartPopupMode(aRect, FLOATWIN_POPUPMODE_RIGHT|FLOATWIN_POPUPMODE_ALLOWTEAROFF);
     SetPopupWindow( pPopup );
@@ -544,18 +544,18 @@ void SwNavigationPI::_ZoomOut()
         FillBox();
         if(IsGlobalMode())
         {
-            aGlobalTree.ShowTree();
+            aGlobalTree->ShowTree();
         }
         else
         {
-            aContentTree.ShowTree();
-            aDocListBox.Show();
+            aContentTree->ShowTree();
+            aDocListBox->Show();
         }
-        SvTreeListEntry* pFirst = aContentTree.FirstSelected();
+        SvTreeListEntry* pFirst = aContentTree->FirstSelected();
         if(pFirst)
-            aContentTree.Select(pFirst, true); // Enable toolbox
+            aContentTree->Select(pFirst, true); // Enable toolbox
         pConfig->SetSmall( false );
-        aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX);
+        aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX);
     }
 }
 
@@ -567,9 +567,9 @@ void SwNavigationPI::_ZoomIn()
         if (pFloat &&
             (!_IsZoomedIn() || ( pContextWin->GetFloatingWindow()->IsRollUp())))
         {
-            aContentTree.HideTree();
-            aDocListBox.Hide();
-            aGlobalTree.HideTree();
+            aContentTree->HideTree();
+            aDocListBox->Hide();
+            aGlobalTree->HideTree();
             bIsZoomedIn = true;
             Size aSz(GetOutputSizePixel());
             if( aSz.Height() > nZoomIn )
@@ -580,11 +580,11 @@ void SwNavigationPI::_ZoomIn()
             static_cast<SfxDockingWindow*>(GetParent())->SetMinOutputSizePixel(Size(
                     aMinOutSizePixel.Width(), aSz.Height()));
             pFloat->SetOutputSizePixel(aSz);
-            SvTreeListEntry* pFirst = aContentTree.FirstSelected();
+            SvTreeListEntry* pFirst = aContentTree->FirstSelected();
             if(pFirst)
-                aContentTree.Select(pFirst, true); // Enable toolbox
+                aContentTree->Select(pFirst, true); // Enable toolbox
             pConfig->SetSmall( true );
-            aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, false);
+            aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX, false);
         }
     }
 }
@@ -616,25 +616,25 @@ void SwNavigationPI::Resize()
             pDockingParent->SetMinOutputSizePixel(aMinOutSizePixel);
         }
 
-        const Point aPos = aContentTree.GetPosPixel();
-        Point aLBPos = aDocListBox.GetPosPixel();
+        const Point aPos = aContentTree->GetPosPixel();
+        Point aLBPos = aDocListBox->GetPosPixel();
         long nDist = aPos.X();
         aNewSize.Height() -= (aPos.Y() + aPos.X() + nDocLBIniHeight + nDist);
         aNewSize.Width() -= 2 * nDist;
         aLBPos.Y() = aPos.Y() + aNewSize.Height() + nDist;
-        aDocListBox.Show(!aGlobalTree.IsVisible() && aLBPos.Y() > aPos.Y() );
+        aDocListBox->Show(!aGlobalTree->IsVisible() && aLBPos.Y() > aPos.Y() );
 
-        Size aDocLBSz = aDocListBox.GetSizePixel();
+        Size aDocLBSz = aDocListBox->GetSizePixel();
         aDocLBSz.Width() = aNewSize.Width();
         if(aNewSize.Height() < 0)
             aDocLBSz.Height() = 0;
         else
             aDocLBSz.Height() = nDocLBIniHeight;
-        aContentTree.SetSizePixel(aNewSize);
+        aContentTree->SetSizePixel(aNewSize);
         // GlobalTree starts on to the top and goes all the way down.
-        aNewSize.Height() += (nDist + nDocLBIniHeight + aPos.Y() - aGlobalTree.GetPosPixel().Y());
-        aGlobalTree.SetSizePixel(aNewSize);
-        aDocListBox.setPosSizePixel( aLBPos.X(), aLBPos.Y(),
+        aNewSize.Height() += (nDist + nDocLBIniHeight + aPos.Y() - aGlobalTree->GetPosPixel().Y());
+        aGlobalTree->SetSizePixel(aNewSize);
+        aDocListBox->setPosSizePixel( aLBPos.X(), aLBPos.Y(),
             aDocLBSz.Width(), aDocLBSz.Height(),
             WINDOW_POSSIZE_X|WINDOW_POSSIZE_Y|WINDOW_POSSIZE_WIDTH);
     }
@@ -647,12 +647,12 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     Window( pParent, SW_RES(DLG_NAVIGATION_PI)),
     SfxControllerItem( SID_DOCFULLNAME, *_pBindings ),
 
-    aContentToolBox(this, SW_RES(TB_CONTENT)),
-    aGlobalToolBox(this, SW_RES(TB_GLOBAL)),
+    aContentToolBox(VclPtr<SwNavHelpToolBox>::Create(this, SW_RES(TB_CONTENT))),
+    aGlobalToolBox(VclPtr<SwHelpToolBox>::Create(this, SW_RES(TB_GLOBAL))),
     aContentImageList(SW_RES(IL_CONTENT)),
-    aContentTree(this, SW_RES(TL_CONTENT)),
-    aGlobalTree(this, SW_RES(TL_GLOBAL)),
-    aDocListBox(this, SW_RES(LB_DOCS)),
+    aContentTree(VclPtr<SwContentTree>::Create(this, SW_RES(TL_CONTENT))),
+    aGlobalTree(VclPtr<SwGlobalTree>::Create(this, SW_RES(TL_GLOBAL))),
+    aDocListBox(VclPtr<ListBox>::Create(this, SW_RES(LB_DOCS))),
 
     pxObjectShell(0),
     pContentView(0),
@@ -679,17 +679,17 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     GetCreateView();
     InitImageList();
 
-    aContentToolBox.SetHelpId(HID_NAVIGATOR_TOOLBOX );
-    aGlobalToolBox.SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX);
-    aDocListBox.SetHelpId(HID_NAVIGATOR_LISTBOX );
-    aDocListBox.SetDropDownLineCount(9);
+    aContentToolBox->SetHelpId(HID_NAVIGATOR_TOOLBOX );
+    aGlobalToolBox->SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX);
+    aDocListBox->SetHelpId(HID_NAVIGATOR_LISTBOX );
+    aDocListBox->SetDropDownLineCount(9);
 
-    nDocLBIniHeight = aDocListBox.GetSizePixel().Height();
+    nDocLBIniHeight = aDocListBox->GetSizePixel().Height();
     nZoomOutInit = nZoomOut = Resource::ReadShortRes();
 
     // Insert the numeric field in the toolbox.
-    NumEditAction* pEdit = new NumEditAction(
-                    &aContentToolBox, SW_RES(NF_PAGE ));
+    VclPtr<NumEditAction> pEdit = VclPtr<NumEditAction>::Create(
+                    aContentToolBox.get(), SW_RES(NF_PAGE ));
     pEdit->SetActionHdl(LINK(this, SwNavigationPI, EditAction));
     pEdit->SetGetFocusHdl(LINK(this, SwNavigationPI, EditGetFocus));
     pEdit->SetAccessibleName(pEdit->GetQuickHelpText());
@@ -700,16 +700,16 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
 
     // Double separators are not allowed, so you have to
     // determine the suitable size differently.
-    Rectangle aFirstRect = aContentToolBox.GetItemRect(FN_SELECT_FOOTNOTE);
-    Rectangle aSecondRect = aContentToolBox.GetItemRect(FN_SELECT_HEADER);
+    Rectangle aFirstRect = aContentToolBox->GetItemRect(FN_SELECT_FOOTNOTE);
+    Rectangle aSecondRect = aContentToolBox->GetItemRect(FN_SELECT_HEADER);
     Size aItemWinSize( aFirstRect.Left() - aSecondRect.Left(),
                        aFirstRect.Bottom() - aFirstRect.Top() );
     pEdit->SetSizePixel(aItemWinSize);
-    aContentToolBox.InsertSeparator(4);
-    aContentToolBox.InsertWindow( FN_PAGENUMBER, pEdit, ToolBoxItemBits::NONE, 4);
-    aContentToolBox.InsertSeparator(4);
-    aContentToolBox.SetHelpId(FN_PAGENUMBER, HID_NAVI_TBX16);
-    aContentToolBox.ShowItem( FN_PAGENUMBER );
+    aContentToolBox->InsertSeparator(4);
+    aContentToolBox->InsertWindow( FN_PAGENUMBER, pEdit, ToolBoxItemBits::NONE, 4);
+    aContentToolBox->InsertSeparator(4);
+    aContentToolBox->SetHelpId(FN_PAGENUMBER, HID_NAVI_TBX16);
+    aContentToolBox->ShowItem( FN_PAGENUMBER );
 
     for( sal_uInt16 i = 0; i <= REGION_MODE_EMBEDDED; i++  )
     {
@@ -724,15 +724,15 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     nZoomIn = (short)rOutSize.Height();
 
     // Make sure the toolbox has a size that fits all its contents
-    Size aContentToolboxSize( aContentToolBox.CalcWindowSizePixel() );
-    aContentToolBox.SetOutputSizePixel( aContentToolboxSize );
+    Size aContentToolboxSize( aContentToolBox->CalcWindowSizePixel() );
+    aContentToolBox->SetOutputSizePixel( aContentToolboxSize );
 
     // position listbox below toolbar and add some space
-    long nListboxYPos = aContentToolBox.GetPosPixel().Y() + aContentToolboxSize.Height() + 4;
+    long nListboxYPos = aContentToolBox->GetPosPixel().Y() + aContentToolboxSize.Height() + 4;
 
     // The left and right margins around the toolboxes should be equal.
     nWishWidth = aContentToolboxSize.Width();
-    nWishWidth += 2 * aContentToolBox.GetPosPixel().X();
+    nWishWidth += 2 * aContentToolBox->GetPosPixel().X();
 
     DockingWindow* pDockingParent = dynamic_cast<DockingWindow*>(pParent);
     if (pDockingParent != NULL)
@@ -758,76 +758,76 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
         }
     }
 
-    aContentTree.setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
-    aContentTree.SetStyle( aContentTree.GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
+    aContentTree->setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
+    aContentTree->SetStyle( aContentTree->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
                             WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE );
-    aContentTree.SetSpaceBetweenEntries(3);
-    aContentTree.SetSelectionMode( SINGLE_SELECTION );
-    aContentTree.SetDragDropMode(   DragDropMode::CTRL_MOVE |
-                                    DragDropMode::CTRL_COPY |
-                                    DragDropMode::ENABLE_TOP );
-    aContentTree.EnableAsyncDrag(true);
-    aContentTree.ShowTree();
-    aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, true);
+    aContentTree->SetSpaceBetweenEntries(3);
+    aContentTree->SetSelectionMode( SINGLE_SELECTION );
+    aContentTree->SetDragDropMode( DragDropMode::CTRL_MOVE |
+                                  DragDropMode::CTRL_COPY |
+                                  DragDropMode::ENABLE_TOP );
+    aContentTree->EnableAsyncDrag(true);
+    aContentTree->ShowTree();
+    aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX, true);
 
 //  TreeListBox for global document
-    aGlobalTree.setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
-    aGlobalTree.SetSelectionMode( MULTIPLE_SELECTION );
-    aGlobalTree.SetStyle( aGlobalTree.GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
+    aGlobalTree->setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y );
+    aGlobalTree->SetSelectionMode( MULTIPLE_SELECTION );
+    aGlobalTree->SetStyle( aGlobalTree->GetStyle()|WB_HASBUTTONS|WB_HASBUTTONSATROOT|
                                 WB_CLIPCHILDREN|WB_HSCROLL );
-    Size aGlblSize(aGlobalToolBox.CalcWindowSizePixel());
-    aGlobalToolBox.SetSizePixel(aGlblSize);
+    Size aGlblSize(aGlobalToolBox->CalcWindowSizePixel());
+    aGlobalToolBox->SetSizePixel(aGlblSize);
 
 //  Handler
 
     Link aLk = LINK(this, SwNavigationPI, ToolBoxSelectHdl);
-    aContentToolBox.SetSelectHdl( aLk );
-    aGlobalToolBox.SetSelectHdl( aLk );
-    aDocListBox.SetSelectHdl(LINK(this, SwNavigationPI,
+    aContentToolBox->SetSelectHdl( aLk );
+    aGlobalToolBox->SetSelectHdl( aLk );
+    aDocListBox->SetSelectHdl(LINK(this, SwNavigationPI,
                                                     DocListBoxSelectHdl));
-    aContentToolBox.SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) );
-    aContentToolBox.SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
-    aGlobalToolBox.SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) );
-    aGlobalToolBox.SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
-    aGlobalToolBox.CheckItem(FN_GLOBAL_SWITCH, true);
+    aContentToolBox->SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) );
+    aContentToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
+    aGlobalToolBox->SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) );
+    aGlobalToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) );
+    aGlobalToolBox->CheckItem(FN_GLOBAL_SWITCH, true);
 
     vcl::Font aFont(GetFont());
     aFont.SetWeight(WEIGHT_NORMAL);
     GetPageEdit().SetFont(aFont);
-    aFont = aContentTree.GetFont();
+    aFont = aContentTree->GetFont();
     aFont.SetWeight(WEIGHT_NORMAL);
-    aContentTree.SetFont(aFont);
-    aGlobalTree.SetFont(aFont);
+    aContentTree->SetFont(aFont);
+    aGlobalTree->SetFont(aFont);
 
     StartListening(*SfxGetpApp());
     if ( pCreateView )
         StartListening(*pCreateView);
     SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
-    pImgMan->RegisterToolBox(&aContentToolBox, SfxToolboxFlags::CHANGEOUTSTYLE);
-    pImgMan->RegisterToolBox(&aGlobalToolBox, SfxToolboxFlags::CHANGEOUTSTYLE);
+    pImgMan->RegisterToolBox(aContentToolBox.get(), SfxToolboxFlags::CHANGEOUTSTYLE);
+    pImgMan->RegisterToolBox(aGlobalToolBox.get(), SfxToolboxFlags::CHANGEOUTSTYLE);
 
-    aContentToolBox.SetItemBits( FN_CREATE_NAVIGATION, aContentToolBox.GetItemBits( FN_CREATE_NAVIGATION ) | ToolBoxItemBits::DROPDOWNONLY );
-    aContentToolBox.SetItemBits( FN_DROP_REGION, aContentToolBox.GetItemBits( FN_DROP_REGION ) | ToolBoxItemBits::DROPDOWNONLY );
-    aContentToolBox.SetItemBits( FN_OUTLINE_LEVEL, aContentToolBox.GetItemBits( FN_OUTLINE_LEVEL ) | ToolBoxItemBits::DROPDOWNONLY );
+    aContentToolBox->SetItemBits( FN_CREATE_NAVIGATION, aContentToolBox->GetItemBits( FN_CREATE_NAVIGATION ) | ToolBoxItemBits::DROPDOWNONLY );
+    aContentToolBox->SetItemBits( FN_DROP_REGION, aContentToolBox->GetItemBits( FN_DROP_REGION ) | ToolBoxItemBits::DROPDOWNONLY );
+    aContentToolBox->SetItemBits( FN_OUTLINE_LEVEL, aContentToolBox->GetItemBits( FN_OUTLINE_LEVEL ) | ToolBoxItemBits::DROPDOWNONLY );
 
     if(IsGlobalDoc())
     {
         SwView *pActView = GetCreateView();
-        aGlobalToolBox.CheckItem(FN_GLOBAL_SAVE_CONTENT,
+        aGlobalToolBox->CheckItem(FN_GLOBAL_SAVE_CONTENT,
                     pActView->GetWrtShellPtr()->IsGlblDocSaveLinks());
         if(pConfig->IsGlobalActive())
             ToggleTree();
-        aGlobalTree.GrabFocus();
+        aGlobalTree->GrabFocus();
     }
     else
-        aContentTree.GrabFocus();
+        aContentTree->GrabFocus();
     UsePage(0);
     aPageChgIdle.SetIdleHdl(LINK(this, SwNavigationPI, ChangePageHdl));
     aPageChgIdle.SetPriority(SchedulerPriority::LOWEST);
 
-    aContentTree.SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_CONTENT));
-    aGlobalTree.SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_GLOBAL));
-    aDocListBox.SetAccessibleName(aStatusArr[3]);
+    aContentTree->SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_CONTENT));
+    aGlobalTree->SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_GLOBAL));
+    aDocListBox->SetAccessibleName(aStatusArr[3]);
 
     if (pContextWin == NULL)
     {
@@ -835,12 +835,17 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
         // displayed in the sidebar.  While the navigator could change
         // its size, the sidebar can not, and the navigator would just
         // waste space.  Therefore hide this button.
-        aContentToolBox.RemoveItem(aContentToolBox.GetItemPos(FN_SHOW_CONTENT_BOX));
+        aContentToolBox->RemoveItem(aContentToolBox->GetItemPos(FN_SHOW_CONTENT_BOX));
     }
 }
 
 SwNavigationPI::~SwNavigationPI()
 {
+    disposeOnce();
+}
+
+void SwNavigationPI::dispose()
+{
     if(IsGlobalDoc() && !IsGlobalMode())
     {
         SwView *pView = GetCreateView();
@@ -852,21 +857,31 @@ SwNavigationPI::~SwNavigationPI()
     EndListening(*SfxGetpApp());
 
     SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
-    pImgMan->ReleaseToolBox(&aContentToolBox);
-    pImgMan->ReleaseToolBox(&aGlobalToolBox);
-    delete aContentToolBox.GetItemWindow(FN_PAGENUMBER);
-    aContentToolBox.Clear();
+    pImgMan->ReleaseToolBox(aContentToolBox.get());
+    pImgMan->ReleaseToolBox(aGlobalToolBox.get());
+    aContentToolBox->GetItemWindow(FN_PAGENUMBER)->disposeOnce();
+    aContentToolBox->Clear();
     if(pxObjectShell)
     {
         if(pxObjectShell->Is())
             (*pxObjectShell)->DoClose();
         delete pxObjectShell;
     }
-    delete pPopupWindow;
-    delete pFloatingWindow;
 
     if ( IsBound() )
         rBindings.Release(*this);
+
+    pPopupWindow.disposeAndClear();
+    pFloatingWindow.disposeAndClear();
+    aContentToolBox.disposeAndClear();
+    aGlobalToolBox.disposeAndClear();
+    aContentTree.disposeAndClear();
+    aGlobalTree.disposeAndClear();
+    aDocListBox.disposeAndClear();
+
+    aPageChgIdle.Stop();
+
+    vcl::Window::dispose();
 }
 
 void SwNavigationPI::SetPopupWindow( SfxPopupWindow* pWindow )
@@ -882,7 +897,7 @@ IMPL_LINK_NOARG(SwNavigationPI, PopupModeEndHdl)
     {
         // Replace floating window with popup window and destroy
         // floating window instance.
-        delete pFloatingWindow;
+        pFloatingWindow.disposeAndClear();
         pFloatingWindow = pPopupWindow;
         pPopupWindow    = 0;
     }
@@ -915,9 +930,9 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
         if(pActView)
         {
             SwWrtShell* pWrtShell = pActView->GetWrtShellPtr();
-            aContentTree.SetActiveShell(pWrtShell);
+            aContentTree->SetActiveShell(pWrtShell);
             bool bGlobal = IsGlobalDoc();
-            aContentToolBox.EnableItem(FN_GLOBAL_SWITCH, bGlobal);
+            aContentToolBox->EnableItem(FN_GLOBAL_SWITCH, bGlobal);
             if( (!bGlobal && IsGlobalMode()) ||
                     (!IsGlobalMode() && pConfig->IsGlobalActive()) )
             {
@@ -925,12 +940,12 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
             }
             if(bGlobal)
             {
-                aGlobalToolBox.CheckItem(FN_GLOBAL_SAVE_CONTENT, pWrtShell->IsGlblDocSaveLinks());
+                aGlobalToolBox->CheckItem(FN_GLOBAL_SAVE_CONTENT, pWrtShell->IsGlblDocSaveLinks());
             }
         }
         else
         {
-            aContentTree.SetActiveShell(0);
+            aContentTree->SetActiveShell(0);
         }
         UpdateListBox();
     }
@@ -940,7 +955,7 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
 
 NumEditAction& SwNavigationPI::GetPageEdit()
 {
-    return *static_cast<NumEditAction*>(aContentToolBox.GetItemWindow(FN_PAGENUMBER));
+    return *static_cast<NumEditAction*>(aContentToolBox->GetItemWindow(FN_PAGENUMBER));
 }
 
 // Notification on modified DocInfo
@@ -969,15 +984,15 @@ void SwNavigationPI::Notify( SfxBroadcaster& rBrdc, const SfxHint& rHint )
                 if(pActView)
                 {
                     SwWrtShell* pWrtShell = pActView->GetWrtShellPtr();
-                    aContentTree.SetActiveShell(pWrtShell);
-                    if(aGlobalTree.IsVisible())
+                    aContentTree->SetActiveShell(pWrtShell);
+                    if(aGlobalTree->IsVisible())
                     {
-                        if(aGlobalTree.Update( false ))
-                            aGlobalTree.Display();
+                        if(aGlobalTree->Update( false ))
+                            aGlobalTree->Display();
                         else
                         // If no update is needed, then paint at least,
                         // because of the red entries for the broken links.
-                            aGlobalTree.Invalidate();
+                            aGlobalTree->Invalidate();
                     }
                 }
             }
@@ -993,24 +1008,24 @@ IMPL_LINK( SwNavigationPI, MenuSelectHdl, Menu *, pMenu )
         if(nMenuId < 100)
             SetRegionDropMode( --nMenuId);
         else
-            aContentTree.SetOutlineLevel( static_cast< sal_uInt8 >(nMenuId - 100) );
+            aContentTree->SetOutlineLevel( static_cast< sal_uInt8 >(nMenuId - 100) );
     }
     return 0;
 }
 
 void SwNavigationPI::UpdateListBox()
 {
-    aDocListBox.SetUpdateMode(false);
-    aDocListBox.Clear();
+    aDocListBox->SetUpdateMode(false);
+    aDocListBox->Clear();
     SwView *pActView = GetCreateView();
     bool bDisable = pActView == 0;
     SwView *pView = SwModule::GetFirstView();
     sal_Int32 nCount = 0;
     sal_Int32 nAct = 0;
     sal_Int32 nConstPos = 0;
-    const SwView* pConstView = aContentTree.IsConstantView() &&
-                                aContentTree.GetActiveWrtShell() ?
-                                    &aContentTree.GetActiveWrtShell()->GetView():
+    const SwView* pConstView = aContentTree->IsConstantView() &&
+                                aContentTree->GetActiveWrtShell() ?
+                                    &aContentTree->GetActiveWrtShell()->GetView():
                                         0;
     while (pView)
     {
@@ -1028,7 +1043,7 @@ void SwNavigationPI::UpdateListBox()
             else
                 sEntry += aStatusArr[ST_INACTIVE - ST_STATUS_FIRST];
             sEntry += ")";
-            aDocListBox.InsertEntry(sEntry);
+            aDocListBox->InsertEntry(sEntry);
 
             if (pConstView && pView == pConstView)
                 nConstPos = nCount;
@@ -1037,33 +1052,33 @@ void SwNavigationPI::UpdateListBox()
         }
         pView = SwModule::GetNextView(pView);
     }
-    aDocListBox.InsertEntry(aStatusArr[3]); // "Active Window"
+    aDocListBox->InsertEntry(aStatusArr[3]); // "Active Window"
     nCount++;
 
-    if(aContentTree.GetHiddenWrtShell())
+    if(aContentTree->GetHiddenWrtShell())
     {
-        OUString sEntry = aContentTree.GetHiddenWrtShell()->GetView().
+        OUString sEntry = aContentTree->GetHiddenWrtShell()->GetView().
                                         GetDocShell()->GetTitle();
         sEntry += " (";
         sEntry += aStatusArr[ST_HIDDEN - ST_STATUS_FIRST];
         sEntry += ")";
-        aDocListBox.InsertEntry(sEntry);
+        aDocListBox->InsertEntry(sEntry);
         bDisable = false;
     }
-    if(aContentTree.IsActiveView())
+    if(aContentTree->IsActiveView())
     {
         //Either the name of the current Document or "Active Document".
-        aDocListBox.SelectEntryPos( pActView ? nAct : --nCount );
+        aDocListBox->SelectEntryPos( pActView ? nAct : --nCount );
     }
-    else if(aContentTree.IsHiddenView())
+    else if(aContentTree->IsHiddenView())
     {
-        aDocListBox.SelectEntryPos(nCount);
+        aDocListBox->SelectEntryPos(nCount);
     }
     else
-        aDocListBox.SelectEntryPos(nConstPos);
+        aDocListBox->SelectEntryPos(nConstPos);
 
-    aDocListBox.Enable( !bDisable );
-    aDocListBox.SetUpdateMode(true);
+    aDocListBox->Enable( !bDisable );
+    aDocListBox->SetUpdateMode(true);
 }
 
 IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
@@ -1074,7 +1089,7 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
         SfxViewFrame* pFrame =  pFrameItem->GetFrame();
         if(pFrame)
         {
-            aContentTree.Clear();
+            aContentTree->Clear();
             pContentView = PTR_CAST(SwView, pFrame->GetViewShell());
             OSL_ENSURE(pContentView, "no SwView");
             if(pContentView)
@@ -1083,7 +1098,7 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
                 pContentWrtShell = 0;
             pxObjectShell = new SfxObjectShellLock(pFrame->GetObjectShell());
             FillBox();
-            aContentTree.Update();
+            aContentTree->Update();
         }
     }
     return 0;
@@ -1125,14 +1140,14 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
 sal_Int8 SwNavigationPI::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
     return ( !SwContentTree::IsInDrag() &&
-        ( aContentTree.IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) ||
-          aContentTree.IsDropFormatSupported( SotClipboardFormatId::STRING ) ||
-          aContentTree.IsDropFormatSupported( SotClipboardFormatId::SOLK ) ||
-           aContentTree.IsDropFormatSupported( SotClipboardFormatId::NETSCAPE_BOOKMARK )||
-           aContentTree.IsDropFormatSupported( SotClipboardFormatId::FILECONTENT ) ||
-           aContentTree.IsDropFormatSupported( SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
-           aContentTree.IsDropFormatSupported( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) ||
-           aContentTree.IsDropFormatSupported( SotClipboardFormatId::FILENAME )))
+        ( aContentTree->IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) ||
+          aContentTree->IsDropFormatSupported( SotClipboardFormatId::STRING ) ||
+          aContentTree->IsDropFormatSupported( SotClipboardFormatId::SOLK ) ||
+           aContentTree->IsDropFormatSupported( SotClipboardFormatId::NETSCAPE_BOOKMARK )||
+           aContentTree->IsDropFormatSupported( SotClipboardFormatId::FILECONTENT ) ||
+           aContentTree->IsDropFormatSupported( SotClipboardFormatId::FILEGRPDESCRIPTOR ) ||
+           aContentTree->IsDropFormatSupported( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) ||
+           aContentTree->IsDropFormatSupported( SotClipboardFormatId::FILENAME )))
         ? DND_ACTION_COPY
         : DND_ACTION_NONE;
 }
@@ -1157,7 +1172,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
                 sContentFileName = sFileName;
                 if(pxObjectShell)
                 {
-                    aContentTree.SetHiddenShell( 0 );
+                    aContentTree->SetHiddenShell( 0 );
                     (*pxObjectShell)->DoClose();
                     DELETEZ( pxObjectShell);
                 }
@@ -1187,7 +1202,7 @@ void SwNavigationPI::SetRegionDropMode(sal_uInt16 nNewMode)
 
     ImageList& rImgLst = aContentImageList;
 
-    aContentToolBox.SetItemImage( FN_DROP_REGION, rImgLst.GetImage(nDropId));
+    aContentToolBox->SetItemImage( FN_DROP_REGION, rImgLst.GetImage(nDropId));
 }
 
 bool    SwNavigationPI::ToggleTree()
@@ -1199,23 +1214,23 @@ bool    SwNavigationPI::ToggleTree()
         SetUpdateMode(false);
         if(_IsZoomedIn())
             _ZoomOut();
-        aGlobalTree.ShowTree();
-        aGlobalToolBox.Show();
-        aContentTree.HideTree();
-        aContentToolBox.Hide();
-        aDocListBox.Hide();
+        aGlobalTree->ShowTree();
+        aGlobalToolBox->Show();
+        aContentTree->HideTree();
+        aContentToolBox->Hide();
+        aDocListBox->Hide();
         SetGlobalMode(true);
         SetUpdateMode(true);
     }
     else
     {
-        aGlobalTree.HideTree();
-        aGlobalToolBox.Hide();
+        aGlobalTree->HideTree();
+        aGlobalToolBox->Hide();
         if(!_IsZoomedIn())
         {
-            aContentTree.ShowTree();
-            aContentToolBox.Show();
-            aDocListBox.Show();
+            aContentTree->ShowTree();
+            aContentToolBox->Show();
+            aDocListBox->Show();
         }
         bRet = false;
         SetGlobalMode(false);
@@ -1237,8 +1252,11 @@ bool    SwNavigationPI::IsGlobalDoc() const
 
 IMPL_LINK_NOARG(SwNavigationPI, ChangePageHdl)
 {
-    EditAction(&GetPageEdit());
-    GetPageEdit().GrabFocus();
+    if (!IsDisposed())
+    {
+        EditAction(&GetPageEdit());
+        GetPageEdit().GrabFocus();
+    }
     return 0;
 }
 
@@ -1275,7 +1293,7 @@ SwNavigationChild::SwNavigationChild( vcl::Window* pParent,
                         SfxChildWinInfo* )
     : SfxChildWindowContext( nId )
 {
-    SwNavigationPI* pNavi  = new SwNavigationPI( _pBindings, this, pParent );
+    VclPtr<SwNavigationPI> pNavi = VclPtr<SwNavigationPI>::Create( _pBindings, this, pParent );
     SetWindow( pNavi );
     _pBindings->Invalidate(SID_NAVIGATOR);
 
@@ -1284,10 +1302,10 @@ SwNavigationChild::SwNavigationChild( vcl::Window* pParent,
     const sal_uInt16 nRootType = static_cast< sal_uInt16 >( pNaviConfig->GetRootType() );
     if( nRootType < CONTENT_TYPE_MAX )
     {
-        pNavi->aContentTree.SetRootType(nRootType);
-        pNavi->aContentToolBox.CheckItem(FN_SHOW_ROOT, true);
+        pNavi->aContentTree->SetRootType(nRootType);
+        pNavi->aContentToolBox->CheckItem(FN_SHOW_ROOT, true);
     }
-    pNavi->aContentTree.SetOutlineLevel( static_cast< sal_uInt8 >( pNaviConfig->GetOutlineLevel() ) );
+    pNavi->aContentTree->SetOutlineLevel( static_cast< sal_uInt8 >( pNaviConfig->GetOutlineLevel() ) );
     pNavi->SetRegionDropMode( static_cast< sal_uInt16 >( pNaviConfig->GetRegionMode() ) );
 
     if(GetFloatingWindow() && pNaviConfig->IsSmall())
@@ -1313,20 +1331,20 @@ void SwNavigationPI::DataChanged( const DataChangedEvent& rDCEvt )
 void SwNavigationPI::InitImageList()
 {
     ImageList& rImgLst = aContentImageList;
-    for( sal_uInt16 k = 0; k < aContentToolBox.GetItemCount(); k++)
-            aContentToolBox.SetItemImage(aContentToolBox.GetItemId(k),
-                    rImgLst.GetImage(aContentToolBox.GetItemId(k)));
+    for( sal_uInt16 k = 0; k < aContentToolBox->GetItemCount(); k++)
+            aContentToolBox->SetItemImage(aContentToolBox->GetItemId(k),
+                    rImgLst.GetImage(aContentToolBox->GetItemId(k)));
 
-    for( sal_uInt16 k = 0; k < aGlobalToolBox.GetItemCount(); k++)
-            aGlobalToolBox.SetItemImage(aGlobalToolBox.GetItemId(k),
-                    rImgLst.GetImage(aGlobalToolBox.GetItemId(k)));
+    for( sal_uInt16 k = 0; k < aGlobalToolBox->GetItemCount(); k++)
+            aGlobalToolBox->SetItemImage(aGlobalToolBox->GetItemId(k),
+                    rImgLst.GetImage(aGlobalToolBox->GetItemId(k)));
 
     sal_uInt16 nDropId = FN_DROP_REGION;
     if(nRegionMode == REGION_MODE_LINK)
         nDropId = FN_DROP_REGION_LINK;
     else if(nRegionMode == REGION_MODE_EMBEDDED)
         nDropId = FN_DROP_REGION_COPY;
-    aContentToolBox.SetItemImage( FN_DROP_REGION,
+    aContentToolBox->SetItemImage( FN_DROP_REGION,
                                     rImgLst.GetImage(nDropId));
 }
 
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index c4ad0d190093..56d87e6edb49 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -109,7 +109,13 @@ void NumFormatListBox::Init(short nFormatType, bool bUsrFmts)
 
 NumFormatListBox::~NumFormatListBox()
 {
+    disposeOnce();
+}
+
+void NumFormatListBox::dispose()
+{
     delete pOwnFormatter;
+    ListBox::dispose();
 }
 
 SwView* NumFormatListBox::GetView()
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 707f361d5020..a7446c3a4096 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -66,7 +66,7 @@ SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin,
                                         sal_uInt32 nFlags,
                                         const Link* pInitializedLink,
                                         const OUString* pURL ) :
-    aTopWindow(&rWin, this),
+    aTopWindow(VclPtr<SwFrmCtrlWindow>::Create(&rWin, this)),
     aMenuRes(SW_RES(RES_FRMEX_MENU)),
     pModuleView(SW_MOD()->GetView()),
     nStyleFlags(nFlags),
@@ -76,7 +76,7 @@ SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin,
     if (pURL && !pURL->isEmpty())
         sArgumentURL = *pURL;
 
-    aTopWindow.SetPosSizePixel(Point(0, 0), rWin.GetSizePixel());
+    aTopWindow->SetPosSizePixel(Point(0, 0), rWin.GetSizePixel());
 
     if( pInitializedLink )
         aInitializedLink = *pInitializedLink;
@@ -87,7 +87,7 @@ SwOneExampleFrame::SwOneExampleFrame( vcl::Window& rWin,
 
     CreateControl();
 
-    aTopWindow.Show();
+    aTopWindow->Show();
 }
 
 void SwOneExampleFrame::CreateErrorMessage(vcl::Window* pParent)
@@ -117,7 +117,7 @@ void SwOneExampleFrame::CreateControl()
     _xControl = uno::Reference< awt::XControl >(xInst, uno::UNO_QUERY);
     if(_xControl.is())
     {
-        uno::Reference< awt::XWindowPeer >  xParent( aTopWindow.GetComponentInterface() );
+        uno::Reference< awt::XWindowPeer >  xParent( aTopWindow->GetComponentInterface() );
 
         uno::Reference< awt::XToolkit >  xToolkit( awt::Toolkit::create(xContext), uno::UNO_QUERY_THROW );
 
@@ -125,7 +125,7 @@ void SwOneExampleFrame::CreateControl()
 
         uno::Reference< awt::XWindow >  xWin( _xControl, uno::UNO_QUERY );
         xWin->setVisible(sal_False);
-        Size aWinSize(aTopWindow.GetOutputSizePixel());
+        Size aWinSize(aTopWindow->GetOutputSizePixel());
         xWin->setPosSize( 0, 0, aWinSize.Width(), aWinSize.Height(), awt::PosSize::SIZE );
 
         uno::Reference< beans::XPropertySet >  xPrSet(xInst, uno::UNO_QUERY);
@@ -361,7 +361,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
         }
 
         uno::Reference< awt::XWindow >  xWin( _xControl, uno::UNO_QUERY );
-        Size aWinSize(aTopWindow.GetOutputSizePixel());
+        Size aWinSize(aTopWindow->GetOutputSizePixel());
         xWin->setPosSize( 0, 0, aWinSize.Width(), aWinSize.Height(), awt::PosSize::SIZE );
 
         // can only be done here - the SFX changes the ScrollBar values
@@ -376,7 +376,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
             xScrCrsr->screenUp();
 
         xWin->setVisible( sal_True );
-        aTopWindow.Show();
+        aTopWindow->Show();
 
         if( xTunnel.is() )
         {
@@ -482,7 +482,7 @@ void SwOneExampleFrame::CreatePopup(const Point& rPt)
         aPop.SetPopupMenu( ITEM_ZOOM, &aSubPop1 );
         aSubPop1.SetSelectHdl(aSelLk);
     }
-    aPop.Execute( &aTopWindow, rPt );
+    aPop.Execute( aTopWindow.get(), rPt );
 
 }