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

5 files changed, 87 insertions, 32 deletions

diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index c643e8042942..b778fd68587e 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -406,8 +406,8 @@ namespace dbmm
             // check that the backup location isn't the same as the document itself
             if ( lcl_equalURLs_nothrow( m_pData->aContext, sBackupLocation, m_pData->xDocumentModel->getURL() ) )
             {
-                MessageDialog aErrorBox( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) );
-                aErrorBox.Execute();
+                ScopedVclPtrInstance< MessageDialog > aErrorBox( const_cast< MacroMigrationDialog* >( this ), MacroMigrationResId( STR_INVALID_BACKUP_LOCATION ) );
+                aErrorBox->Execute();
                 rBackupPage.grabLocationFocus();
                 return false;
             }
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index c4ccd03e6353..c97494f41fda 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -67,14 +67,25 @@ namespace dbmm
         get(m_pCloseDocError, "closedocerror");
     }
 
+    PreparationPage::~PreparationPage()
+    {
+        disposeOnce();
+    }
+
+    void PreparationPage::dispose()
+    {
+        m_pCloseDocError.clear();
+        MacroMigrationPage::dispose();
+    }
+
     void PreparationPage::showCloseDocsError( bool _bShow )
     {
         m_pCloseDocError->Show( _bShow );
     }
 
-    TabPage* PreparationPage::Create( ::svt::RoadmapWizard& _rParentDialog )
+    VclPtr<TabPage> PreparationPage::Create( ::svt::RoadmapWizard& _rParentDialog )
     {
-        return new PreparationPage(&_rParentDialog);
+        return VclPtr<PreparationPage>::Create(&_rParentDialog);
     }
 
     // SaveDBDocPage
@@ -95,7 +106,16 @@ namespace dbmm
 
     SaveDBDocPage::~SaveDBDocPage()
     {
+        disposeOnce();
+    }
+
+    void SaveDBDocPage::dispose()
+    {
         delete m_pLocationController;
+        m_pSaveAsLocation.clear();
+        m_pBrowseSaveAsLocation.clear();
+        m_pStartMigration.clear();
+        MacroMigrationPage::dispose();
     }
 
     void SaveDBDocPage::impl_updateLocationDependentItems()
@@ -156,9 +176,9 @@ namespace dbmm
         return true;
     }
 
-    TabPage* SaveDBDocPage::Create( ::svt::RoadmapWizard& _rParentDialog )
+    VclPtr<TabPage> SaveDBDocPage::Create( ::svt::RoadmapWizard& _rParentDialog )
     {
-        return new SaveDBDocPage( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) );
+        return VclPtr<SaveDBDocPage>::Create( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) );
     }
 
     // ProgressPage
@@ -174,9 +194,24 @@ namespace dbmm
         get(m_pMigrationDone, "done");
     }
 
-    TabPage* ProgressPage::Create(::svt::RoadmapWizard& _rParentDialog)
+    ProgressPage::~ProgressPage()
     {
-        return new ProgressPage(&_rParentDialog);
+        disposeOnce();
+    }
+
+    void ProgressPage::dispose()
+    {
+        m_pObjectCount.clear();
+        m_pCurrentObject.clear();
+        m_pCurrentAction.clear();
+        m_pAllProgressText.clear();
+        m_pMigrationDone.clear();
+        MacroMigrationPage::dispose();
+    }
+
+    VclPtr<TabPage> ProgressPage::Create(::svt::RoadmapWizard& _rParentDialog)
+    {
+        return VclPtr<ProgressPage>::Create(&_rParentDialog);
     }
 
     void ProgressPage::setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports )
@@ -256,9 +291,22 @@ namespace dbmm
         get(m_pFailureLabel, "failure");
     }
 
-    TabPage* ResultPage::Create(::svt::RoadmapWizard& _rParentDialog)
+    ResultPage::~ResultPage()
+    {
+        disposeOnce();
+    }
+
+    void ResultPage::dispose()
+    {
+        m_pSuccessLabel.clear();
+        m_pFailureLabel.clear();
+        m_pChanges.clear();
+        MacroMigrationPage::dispose();
+    }
+
+    VclPtr<TabPage> ResultPage::Create(::svt::RoadmapWizard& _rParentDialog)
     {
-        return new ResultPage(&_rParentDialog);
+        return VclPtr<ResultPage>::Create(&_rParentDialog);
     }
 
     void ResultPage::displayMigrationLog(const bool _bSuccessful, const OUString& _rSummary)
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index fc6ffc934521..70a70826783f 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -57,14 +57,16 @@ namespace dbmm
     {
     public:
         PreparationPage(vcl::Window *pParent);
+        virtual ~PreparationPage();
+        virtual void dispose() SAL_OVERRIDE;
 
-        static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
+        static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
 
     public:
         void    showCloseDocsError(bool _bShow);
 
     protected:
-        FixedText*  m_pCloseDocError;
+        VclPtr<FixedText>  m_pCloseDocError;
     };
 
     // SaveDBDocPage
@@ -73,16 +75,17 @@ namespace dbmm
     public:
         SaveDBDocPage(MacroMigrationDialog& _rParentDialog);
         virtual ~SaveDBDocPage();
-        static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
+        virtual void dispose() SAL_OVERRIDE;
+        static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
 
     public:
         OUString getBackupLocation() const { return m_pLocationController->getURL(); }
         void            grabLocationFocus() { m_pSaveAsLocation->GrabFocus(); }
 
     protected:
-        ::svt::OFileURLControl*  m_pSaveAsLocation;
-        PushButton*             m_pBrowseSaveAsLocation;
-        FixedText*              m_pStartMigration;
+        VclPtr<::svt::OFileURLControl>  m_pSaveAsLocation;
+        VclPtr<PushButton>             m_pBrowseSaveAsLocation;
+        VclPtr<FixedText>              m_pStartMigration;
         ::svx::DatabaseLocationInputController* m_pLocationController;
 
     protected:
@@ -101,8 +104,10 @@ namespace dbmm
     {
     public:
         ProgressPage(vcl::Window *pParent);
+        virtual ~ProgressPage();
+        virtual void dispose() SAL_OVERRIDE;
 
-        static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
+        static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
 
         void    setDocumentCounts( const sal_Int32 _nForms, const sal_Int32 _nReports );
         void    onFinishedSuccessfully();
@@ -118,13 +123,13 @@ namespace dbmm
         virtual void    setOverallProgressValue( const sal_uInt32 _nValue ) SAL_OVERRIDE;
 
     private:
-        FixedText*          m_pObjectCount;
-        FixedText*          m_pCurrentObject;
-        FixedText*          m_pCurrentAction;
-        RangeProgressBar    m_aCurrentProgress;
-        FixedText*          m_pAllProgressText;
-        RangeProgressBar    m_aAllProgress;
-        FixedText*          m_pMigrationDone;
+        VclPtr<FixedText>          m_pObjectCount;
+        VclPtr<FixedText>          m_pCurrentObject;
+        VclPtr<FixedText>          m_pCurrentAction;
+        RangeProgressBar           m_aCurrentProgress;
+        VclPtr<FixedText>          m_pAllProgressText;
+        RangeProgressBar           m_aAllProgress;
+        VclPtr<FixedText>          m_pMigrationDone;
     };
 
     // ResultPage
@@ -132,15 +137,17 @@ namespace dbmm
     {
     public:
         ResultPage(vcl::Window *pParent);
+        virtual ~ResultPage();
+        virtual void dispose() SAL_OVERRIDE;
 
-        static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
+        static VclPtr<TabPage> Create( ::svt::RoadmapWizard& _rParentDialog );
 
         void            displayMigrationLog( const bool _bSuccessful, const OUString& _rLog );
 
     private:
-        FixedText*        m_pSuccessLabel;
-        FixedText*        m_pFailureLabel;
-        VclMultiLineEdit* m_pChanges;
+        VclPtr<FixedText>        m_pSuccessLabel;
+        VclPtr<FixedText>        m_pFailureLabel;
+        VclPtr<VclMultiLineEdit> m_pChanges;
     };
 
 } // namespace dbmm
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 5966a9b27e3c..740a337aeca8 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -88,7 +88,7 @@ namespace dbmm
         virtual ~MacroMigrationDialogService();
 
     protected:
-        virtual Dialog* createDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
+        virtual VclPtr<Dialog> createDialog( vcl::Window* _pParent ) SAL_OVERRIDE;
         virtual void destroyDialog() SAL_OVERRIDE;
 
     private:
@@ -121,9 +121,9 @@ namespace dbmm
         return *(new MacroMigrationDialogService( _rxContext ) );
     }
 
-    Dialog* MacroMigrationDialogService::createDialog( vcl::Window* _pParent )
+    VclPtr<Dialog> MacroMigrationDialogService::createDialog( vcl::Window* _pParent )
     {
-        return new MacroMigrationDialog( _pParent, m_aContext, m_xDocument );
+        return VclPtr<MacroMigrationDialog>::Create( _pParent, m_aContext, m_xDocument );
     }
 
     void MacroMigrationDialogService::destroyDialog()
diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
index 0dde133e7f10..7b5a1a0e1282 100644
--- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
+++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
@@ -65,7 +65,7 @@ namespace dbmm
         }
 
     private:
-        ProgressBar *m_pBar;
+        VclPtr<ProgressBar> m_pBar;
         sal_uInt32  m_nRange;
     };