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, 31 insertions, 30 deletions

diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 0686c81ceb3a..70d01e9b87ff 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -47,7 +47,7 @@ class SvxBackgroundTabPage : public SvxTabPage
     using TabPage::DeactivatePage;
     static const sal_uInt16 pPageRanges[];
 public:
-    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
     // returns the area of the which-values
     static const sal_uInt16* GetRanges() { return pPageRanges; }
 
@@ -71,40 +71,41 @@ protected:
 private:
     SvxBackgroundTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet );
     virtual ~SvxBackgroundTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    VclContainer*           m_pAsGrid;
-    FixedText*              m_pSelectTxt;
-    ListBox*                m_pLbSelect;
-    FixedText*              m_pTblDesc;
-    ListBox*                m_pTblLBox;
-    ListBox*                m_pParaLBox;
+    VclPtr<VclContainer>           m_pAsGrid;
+    VclPtr<FixedText>              m_pSelectTxt;
+    VclPtr<ListBox>                m_pLbSelect;
+    VclPtr<FixedText>              m_pTblDesc;
+    VclPtr<ListBox>                m_pTblLBox;
+    VclPtr<ListBox>                m_pParaLBox;
 
-    VclFrame*               m_pBackGroundColorFrame;
-    SvxColorValueSet*       m_pBackgroundColorSet;
-    BackgroundPreviewImpl*  m_pPreviewWin1;
+    VclPtr<VclFrame>               m_pBackGroundColorFrame;
+    VclPtr<SvxColorValueSet>       m_pBackgroundColorSet;
+    VclPtr<BackgroundPreviewImpl>  m_pPreviewWin1;
 
-    FixedText*              m_pColTransFT;///<color transparency
-    MetricField*            m_pColTransMF;
-    CheckBox*               m_pBtnPreview;
+    VclPtr<FixedText>              m_pColTransFT;///<color transparency
+    VclPtr<MetricField>            m_pColTransMF;
+    VclPtr<CheckBox>               m_pBtnPreview;
 
     // Background Bitmap ----------------------------------
-    VclContainer*           m_pBitmapContainer;
-    VclContainer*           m_pFileFrame;
-    PushButton*             m_pBtnBrowse;
-    CheckBox*               m_pBtnLink;
-    FixedText*              m_pFtUnlinked;
-    FixedText*              m_pFtFile;
-
-    VclContainer*           m_pTypeFrame;
-    RadioButton*            m_pBtnPosition;
-    RadioButton*            m_pBtnArea;
-    RadioButton*            m_pBtnTile;
-    SvxRectCtl*             m_pWndPosition;
-
-    VclContainer*           m_pGraphTransFrame;///<transparency of graphics
-    MetricField*            m_pGraphTransMF;
-
-    BackgroundPreviewImpl*  m_pPreviewWin2;
+    VclPtr<VclContainer>           m_pBitmapContainer;
+    VclPtr<VclContainer>           m_pFileFrame;
+    VclPtr<PushButton>             m_pBtnBrowse;
+    VclPtr<CheckBox>               m_pBtnLink;
+    VclPtr<FixedText>              m_pFtUnlinked;
+    VclPtr<FixedText>              m_pFtFile;
+
+    VclPtr<VclContainer>           m_pTypeFrame;
+    VclPtr<RadioButton>            m_pBtnPosition;
+    VclPtr<RadioButton>            m_pBtnArea;
+    VclPtr<RadioButton>            m_pBtnTile;
+    VclPtr<SvxRectCtl>             m_pWndPosition;
+
+    VclPtr<VclContainer>           m_pGraphTransFrame;///<transparency of graphics
+    VclPtr<MetricField>            m_pGraphTransMF;
+
+    VclPtr<BackgroundPreviewImpl>  m_pPreviewWin2;
 
     // DDListBox for Writer -------------------------------