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

1 files changed, 87 insertions, 37 deletions

diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 257d08d189e0..b6681c756320 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -197,39 +197,39 @@ Reference< XNameAccess >  getColumns(const Reference< XForm > & _rxForm)
 class MappingDialog_Impl : public ModalDialog
 {
     BibDataManager* pDatMan;
-    OKButton*       pOKBT;
-    ListBox*        pIdentifierLB;
-    ListBox*        pAuthorityTypeLB;
-    ListBox*        pAuthorLB;
-    ListBox*        pTitleLB;
-    ListBox*        pMonthLB;
-    ListBox*        pYearLB;
-    ListBox*        pISBNLB;
-    ListBox*        pBooktitleLB;
-    ListBox*        pChapterLB;
-    ListBox*        pEditionLB;
-    ListBox*        pEditorLB;
-    ListBox*        pHowpublishedLB;
-    ListBox*        pInstitutionLB;
-    ListBox*        pJournalLB;
-    ListBox*        pNoteLB;
-    ListBox*        pAnnoteLB;
-    ListBox*        pNumberLB;
-    ListBox*        pOrganizationsLB;
-    ListBox*        pPagesLB;
-    ListBox*        pPublisherLB;
-    ListBox*        pAddressLB;
-    ListBox*        pSchoolLB;
-    ListBox*        pSeriesLB;
-    ListBox*        pReportTypeLB;
-    ListBox*        pVolumeLB;
-    ListBox*        pURLLB;
-    ListBox*        pCustom1LB;
-    ListBox*        pCustom2LB;
-    ListBox*        pCustom3LB;
-    ListBox*        pCustom4LB;
-    ListBox*        pCustom5LB;
-    ListBox*        aListBoxes[COLUMN_COUNT];
+    VclPtr<OKButton>       pOKBT;
+    VclPtr<ListBox>        pIdentifierLB;
+    VclPtr<ListBox>        pAuthorityTypeLB;
+    VclPtr<ListBox>        pAuthorLB;
+    VclPtr<ListBox>        pTitleLB;
+    VclPtr<ListBox>        pMonthLB;
+    VclPtr<ListBox>        pYearLB;
+    VclPtr<ListBox>        pISBNLB;
+    VclPtr<ListBox>        pBooktitleLB;
+    VclPtr<ListBox>        pChapterLB;
+    VclPtr<ListBox>        pEditionLB;
+    VclPtr<ListBox>        pEditorLB;
+    VclPtr<ListBox>        pHowpublishedLB;
+    VclPtr<ListBox>        pInstitutionLB;
+    VclPtr<ListBox>        pJournalLB;
+    VclPtr<ListBox>        pNoteLB;
+    VclPtr<ListBox>        pAnnoteLB;
+    VclPtr<ListBox>        pNumberLB;
+    VclPtr<ListBox>        pOrganizationsLB;
+    VclPtr<ListBox>        pPagesLB;
+    VclPtr<ListBox>        pPublisherLB;
+    VclPtr<ListBox>        pAddressLB;
+    VclPtr<ListBox>        pSchoolLB;
+    VclPtr<ListBox>        pSeriesLB;
+    VclPtr<ListBox>        pReportTypeLB;
+    VclPtr<ListBox>        pVolumeLB;
+    VclPtr<ListBox>        pURLLB;
+    VclPtr<ListBox>        pCustom1LB;
+    VclPtr<ListBox>        pCustom2LB;
+    VclPtr<ListBox>        pCustom3LB;
+    VclPtr<ListBox>        pCustom4LB;
+    VclPtr<ListBox>        pCustom5LB;
+    VclPtr<ListBox>        aListBoxes[COLUMN_COUNT];
     OUString        sNone;
 
     bool        bModified;
@@ -242,6 +242,7 @@ class MappingDialog_Impl : public ModalDialog
 public:
     MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pDatMan);
     virtual ~MappingDialog_Impl();
+    virtual void dispose() SAL_OVERRIDE;
 
     void    SetModified() {bModified = true;}
 
@@ -378,7 +379,48 @@ MappingDialog_Impl::MappingDialog_Impl(vcl::Window* pParent, BibDataManager* pMa
 }
 
 MappingDialog_Impl::~MappingDialog_Impl()
-{}
+{
+    disposeOnce();
+}
+
+void MappingDialog_Impl::dispose()
+{
+    pOKBT.clear();
+    pIdentifierLB.clear();
+    pAuthorityTypeLB.clear();
+    pAuthorLB.clear();
+    pTitleLB.clear();
+    pMonthLB.clear();
+    pYearLB.clear();
+    pISBNLB.clear();
+    pBooktitleLB.clear();
+    pChapterLB.clear();
+    pEditionLB.clear();
+    pEditorLB.clear();
+    pHowpublishedLB.clear();
+    pInstitutionLB.clear();
+    pJournalLB.clear();
+    pNoteLB.clear();
+    pAnnoteLB.clear();
+    pNumberLB.clear();
+    pOrganizationsLB.clear();
+    pPagesLB.clear();
+    pPublisherLB.clear();
+    pAddressLB.clear();
+    pSchoolLB.clear();
+    pSeriesLB.clear();
+    pReportTypeLB.clear();
+    pVolumeLB.clear();
+    pURLLB.clear();
+    pCustom1LB.clear();
+    pCustom2LB.clear();
+    pCustom3LB.clear();
+    pCustom4LB.clear();
+    pCustom5LB.clear();
+    for(auto & a : aListBoxes)
+        a.clear();
+    ModalDialog::dispose();
+}
 
 IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox)
 {
@@ -428,7 +470,7 @@ IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl)
 
 class DBChangeDialog_Impl : public ModalDialog
 {
-    ListBox*    m_pSelectionLB;
+    VclPtr<ListBox>    m_pSelectionLB;
     DBChangeDialogConfig_Impl   aConfig;
 
     BibDataManager* pDatMan;
@@ -437,6 +479,7 @@ class DBChangeDialog_Impl : public ModalDialog
 public:
     DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan );
     virtual ~DBChangeDialog_Impl();
+    virtual void dispose() SAL_OVERRIDE;
 
     OUString     GetCurrentURL()const;
 };
@@ -479,6 +522,13 @@ IMPL_LINK(DBChangeDialog_Impl, DoubleClickHdl, SvTabListBox*, /*pLB*/)
 
 DBChangeDialog_Impl::~DBChangeDialog_Impl()
 {
+    disposeOnce();
+}
+
+void DBChangeDialog_Impl::dispose()
+{
+    m_pSelectionLB.clear();
+    ModalDialog::dispose();
 }
 
 OUString  DBChangeDialog_Impl::GetCurrentURL()const
@@ -1492,7 +1542,7 @@ void BibDataManager::RemoveMeAsUidListener()
 
 void BibDataManager::CreateMappingDialog(vcl::Window* pParent)
 {
-    boost::scoped_ptr<MappingDialog_Impl> pDlg(new MappingDialog_Impl(pParent, this));
+    VclPtrInstance< MappingDialog_Impl > pDlg(pParent, this);
     if(RET_OK == pDlg->Execute() && pBibView)
     {
         reload();
@@ -1502,7 +1552,7 @@ void BibDataManager::CreateMappingDialog(vcl::Window* pParent)
 OUString BibDataManager::CreateDBChangeDialog(vcl::Window* pParent)
 {
     OUString uRet;
-    boost::scoped_ptr<DBChangeDialog_Impl> pDlg(new DBChangeDialog_Impl(pParent, this ));
+    VclPtrInstance< DBChangeDialog_Impl > pDlg(pParent, this );
     if(RET_OK == pDlg->Execute())
     {
         OUString sNewURL = pDlg->GetCurrentURL();