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, 23 insertions, 20 deletions

diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index 6d641bedadf9..67b6cd2216b8 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -45,13 +45,13 @@ class RTSDialog : public TabDialog
     ::psp::PrinterInfo      m_aJobData;
 
     // controls
-    TabControl*             m_pTabControl;
-    OKButton*               m_pOKButton;
-    CancelButton*           m_pCancelButton;
+    VclPtr<TabControl>      m_pTabControl;
+    VclPtr<OKButton>        m_pOKButton;
+    VclPtr<CancelButton>    m_pCancelButton;
 
     // pages
-    RTSPaperPage*           m_pPaperPage;
-    RTSDevicePage*          m_pDevicePage;
+    VclPtr<RTSPaperPage>    m_pPaperPage;
+    VclPtr<RTSDevicePage>   m_pDevicePage;
 
     // some resources
     OUString                m_aInvalidString;
@@ -64,29 +64,31 @@ class RTSDialog : public TabDialog
 public:
     RTSDialog(const ::psp::PrinterInfo& rJobData, vcl::Window* pParent = NULL);
     virtual ~RTSDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     const ::psp::PrinterInfo& getSetup() const { return m_aJobData; }
 };
 
 class RTSPaperPage : public TabPage
 {
-    RTSDialog*          m_pParent;
+    VclPtr<RTSDialog>          m_pParent;
 
-    FixedText*          m_pPaperText;
-    ListBox*            m_pPaperBox;
+    VclPtr<FixedText>          m_pPaperText;
+    VclPtr<ListBox>            m_pPaperBox;
 
-    ListBox*            m_pOrientBox;
+    VclPtr<ListBox>            m_pOrientBox;
 
-    FixedText*          m_pDuplexText;
-    ListBox*            m_pDuplexBox;
+    VclPtr<FixedText>          m_pDuplexText;
+    VclPtr<ListBox>            m_pDuplexBox;
 
-    FixedText*          m_pSlotText;
-    ListBox*            m_pSlotBox;
+    VclPtr<FixedText>          m_pSlotText;
+    VclPtr<ListBox>            m_pSlotBox;
 
     DECL_LINK( SelectHdl, ListBox* );
 public:
     RTSPaperPage( RTSDialog* );
     virtual ~RTSPaperPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     void update();
 
@@ -95,16 +97,16 @@ public:
 
 class RTSDevicePage : public TabPage
 {
-    RTSDialog*          m_pParent;
+    VclPtr<RTSDialog>          m_pParent;
 
-    ListBox*            m_pPPDKeyBox;
-    ListBox*            m_pPPDValueBox;
+    VclPtr<ListBox>            m_pPPDKeyBox;
+    VclPtr<ListBox>            m_pPPDValueBox;
     const psp::PPDValue* m_pCustomValue;
-    Edit*               m_pCustomEdit;
+    VclPtr<Edit>               m_pCustomEdit;
 
-    ListBox*            m_pLevelBox;
-    ListBox*            m_pSpaceBox;
-    ListBox*            m_pDepthBox;
+    VclPtr<ListBox>            m_pLevelBox;
+    VclPtr<ListBox>            m_pSpaceBox;
+    VclPtr<ListBox>            m_pDepthBox;
 
     void FillValueBox( const ::psp::PPDKey* );
 
@@ -113,6 +115,7 @@ class RTSDevicePage : public TabPage
 public:
     RTSDevicePage( RTSDialog* );
     virtual ~RTSDevicePage();
+    virtual void dispose() SAL_OVERRIDE;
 
     sal_uLong getLevel();
     sal_uLong getPDFDevice();