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, 32 insertions, 27 deletions

diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 160ef1000237..83c590d57ac0 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -116,6 +116,7 @@ public:
 
     SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER);
     virtual ~SvxRedlinTable();
+    virtual void    dispose() SAL_OVERRIDE;
 
     // For FilterPage only {
     void            SetFilterDate(bool bFlag=true);
@@ -179,25 +180,25 @@ private:
     Link            aRefLink;
     Link            aModifyComLink;
 
-    SvxRedlinTable* pRedlinTable;
-    CheckBox*       m_pCbDate;
-    ListBox*        m_pLbDate;
-    DateField*      m_pDfDate;
-    TimeField*      m_pTfDate;
-    PushButton*     m_pIbClock;
-    FixedText*      m_pFtDate2;
-    DateField*      m_pDfDate2;
-    TimeField*      m_pTfDate2;
-    PushButton*     m_pIbClock2;
-    CheckBox*       m_pCbAuthor;
-    ListBox*        m_pLbAuthor;
-    CheckBox*       m_pCbRange;
-    Edit*           m_pEdRange;
-    PushButton*     m_pBtnRange;
-    CheckBox*       m_pCbAction;
-    ListBox*        m_pLbAction;
-    CheckBox*       m_pCbComment;
-    Edit*           m_pEdComment;
+    VclPtr<SvxRedlinTable> pRedlinTable;
+    VclPtr<CheckBox>       m_pCbDate;
+    VclPtr<ListBox>        m_pLbDate;
+    VclPtr<DateField>      m_pDfDate;
+    VclPtr<TimeField>      m_pTfDate;
+    VclPtr<PushButton>     m_pIbClock;
+    VclPtr<FixedText>      m_pFtDate2;
+    VclPtr<DateField>      m_pDfDate2;
+    VclPtr<TimeField>      m_pTfDate2;
+    VclPtr<PushButton>     m_pIbClock2;
+    VclPtr<CheckBox>       m_pCbAuthor;
+    VclPtr<ListBox>        m_pLbAuthor;
+    VclPtr<CheckBox>       m_pCbRange;
+    VclPtr<Edit>           m_pEdRange;
+    VclPtr<PushButton>     m_pBtnRange;
+    VclPtr<CheckBox>       m_pCbAction;
+    VclPtr<ListBox>        m_pLbAction;
+    VclPtr<CheckBox>       m_pCbComment;
+    VclPtr<Edit>           m_pEdComment;
     bool            bModified;
 
     DECL_LINK( SelDateHdl, ListBox* );
@@ -215,6 +216,8 @@ protected:
 
 public:
                     SvxTPFilter( vcl::Window * pParent);
+    virtual         ~SvxTPFilter();
+    virtual void    dispose() SAL_OVERRIDE;
 
     virtual void    DeactivatePage() SAL_OVERRIDE;
     void            SetRedlinTable(SvxRedlinTable*);
@@ -304,12 +307,12 @@ private:
     Link            RejectAllClickLk;
     Link            UndoClickLk;
 
-    SvxRedlinTable* m_pViewData;
-    PushButton*     m_pAccept;
-    PushButton*     m_pReject;
-    PushButton*     m_pAcceptAll;
-    PushButton*     m_pRejectAll;
-    PushButton*     m_pUndo;
+    VclPtr<SvxRedlinTable> m_pViewData;
+    VclPtr<PushButton>     m_pAccept;
+    VclPtr<PushButton>     m_pReject;
+    VclPtr<PushButton>     m_pAcceptAll;
+    VclPtr<PushButton>     m_pRejectAll;
+    VclPtr<PushButton>     m_pUndo;
 
     bool bEnableAccept;
     bool bEnableAcceptAll;
@@ -322,6 +325,7 @@ private:
 public:
     SvxTPView(vcl::Window * pParent, VclBuilderContainer *pTopLevel);
     virtual ~SvxTPView();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            InsertWriterHeader();
     void            InsertCalcHeader();
@@ -370,8 +374,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxAcceptChgCtr
 {
 private:
 
-    SvxTPFilter*    pTPFilter;
-    SvxTPView*      pTPView;
+    VclPtr<SvxTPFilter>    pTPFilter;
+    VclPtr<SvxTPView>      pTPView;
 
     sal_uInt16      m_nViewPageId;
     sal_uInt16      m_nFilterPageId;
@@ -380,6 +384,7 @@ public:
                     SvxAcceptChgCtr(vcl::Window* pParent, VclBuilderContainer* pTopLevel);
 
                     virtual ~SvxAcceptChgCtr();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            ShowFilterPage();
     void            ShowViewPage();