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, 48 insertions, 45 deletions

diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index cfc07cfacaa7..3f2d8bc0734f 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -37,29 +37,29 @@ struct TColumn
 
 class SwFormatTablePage : public SfxTabPage
 {
-    Edit*           m_pNameED;
+    VclPtr<Edit>           m_pNameED;
     TextFilter      m_aTextFilter;
-    FixedText*      m_pWidthFT;
+    VclPtr<FixedText>      m_pWidthFT;
     PercentField m_aWidthMF;
-    CheckBox*       m_pRelWidthCB;
+    VclPtr<CheckBox>       m_pRelWidthCB;
 
-    RadioButton*    m_pFullBtn;
-    RadioButton*    m_pLeftBtn;
-    RadioButton*    m_pFromLeftBtn;
-    RadioButton*    m_pRightBtn;
-    RadioButton*    m_pCenterBtn;
-    RadioButton*    m_pFreeBtn;
+    VclPtr<RadioButton>    m_pFullBtn;
+    VclPtr<RadioButton>    m_pLeftBtn;
+    VclPtr<RadioButton>    m_pFromLeftBtn;
+    VclPtr<RadioButton>    m_pRightBtn;
+    VclPtr<RadioButton>    m_pCenterBtn;
+    VclPtr<RadioButton>    m_pFreeBtn;
 
-    FixedText*      m_pLeftFT;
+    VclPtr<FixedText>      m_pLeftFT;
     PercentField m_aLeftMF;
-    FixedText*      m_pRightFT;
+    VclPtr<FixedText>      m_pRightFT;
     PercentField m_aRightMF;
-    FixedText*      m_pTopFT;
-    MetricField*    m_pTopMF;
-    FixedText*      m_pBottomFT;
-    MetricField*    m_pBottomMF;
+    VclPtr<FixedText>      m_pTopFT;
+    VclPtr<MetricField>    m_pTopMF;
+    VclPtr<FixedText>      m_pBottomFT;
+    VclPtr<MetricField>    m_pBottomMF;
 
-    ListBox*        m_pTextDirectionLB;
+    VclPtr<ListBox>        m_pTextDirectionLB;
 
     SwTableRep*     pTblData;
     SwTwips         nSaveWidth;
@@ -81,8 +81,10 @@ class SwFormatTablePage : public SfxTabPage
 
 public:
     SwFormatTablePage( vcl::Window* pParent, const SfxItemSet& rSet );
+    virtual ~SwFormatTablePage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -94,16 +96,16 @@ public:
 
 class SwTableColumnPage : public SfxTabPage
 {
-    CheckBox*       m_pModifyTableCB;
-    CheckBox*       m_pProportionalCB;
-    FixedText*      m_pSpaceFT;
-    MetricField*    m_pSpaceED;
-    PushButton*     m_pUpBtn;
-    PushButton*     m_pDownBtn;
+    VclPtr<CheckBox>       m_pModifyTableCB;
+    VclPtr<CheckBox>       m_pProportionalCB;
+    VclPtr<FixedText>      m_pSpaceFT;
+    VclPtr<MetricField>    m_pSpaceED;
+    VclPtr<PushButton>     m_pUpBtn;
+    VclPtr<PushButton>     m_pDownBtn;
 
     SwTableRep*     pTblData;
     PercentField  m_aFieldArr[MET_FIELDS];
-    FixedText*      m_pTextArr[MET_FIELDS];
+    VclPtr<FixedText>      m_pTextArr[MET_FIELDS];
     SwTwips         nTableWidth;
     SwTwips         nMinWidth;
     sal_uInt16          nNoOfCols;
@@ -131,8 +133,9 @@ class SwTableColumnPage : public SfxTabPage
 public:
     SwTableColumnPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SwTableColumnPage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
@@ -142,27 +145,27 @@ public:
 
 class SwTextFlowPage : public SfxTabPage
 {
-    CheckBox*       m_pPgBrkCB;
+    VclPtr<CheckBox>       m_pPgBrkCB;
 
-    RadioButton*    m_pPgBrkRB;
-    RadioButton*    m_pColBrkRB;
+    VclPtr<RadioButton>    m_pPgBrkRB;
+    VclPtr<RadioButton>    m_pColBrkRB;
 
-    RadioButton*    m_pPgBrkBeforeRB;
-    RadioButton*    m_pPgBrkAfterRB;
+    VclPtr<RadioButton>    m_pPgBrkBeforeRB;
+    VclPtr<RadioButton>    m_pPgBrkAfterRB;
 
-    CheckBox*       m_pPageCollCB;
-    ListBox*        m_pPageCollLB;
-    FixedText*      m_pPageNoFT;
-    NumericField*   m_pPageNoNF;
-    CheckBox*       m_pSplitCB;
-    TriStateBox*    m_pSplitRowCB;
-    CheckBox*       m_pKeepCB;
-    CheckBox*       m_pHeadLineCB;
-    NumericField*   m_pRepeatHeaderNF;
-    VclContainer*   m_pRepeatHeaderCombo;
-    ListBox*        m_pTextDirectionLB;
+    VclPtr<CheckBox>       m_pPageCollCB;
+    VclPtr<ListBox>        m_pPageCollLB;
+    VclPtr<FixedText>      m_pPageNoFT;
+    VclPtr<NumericField>   m_pPageNoNF;
+    VclPtr<CheckBox>       m_pSplitCB;
+    VclPtr<TriStateBox>    m_pSplitRowCB;
+    VclPtr<CheckBox>       m_pKeepCB;
+    VclPtr<CheckBox>       m_pHeadLineCB;
+    VclPtr<NumericField>   m_pRepeatHeaderNF;
+    VclPtr<VclContainer>   m_pRepeatHeaderCombo;
+    VclPtr<ListBox>        m_pTextDirectionLB;
 
-    ListBox*        m_pVertOrientLB;
+    VclPtr<ListBox>        m_pVertOrientLB;
 
     SwWrtShell*     pShell;
 
@@ -177,11 +180,11 @@ class SwTextFlowPage : public SfxTabPage
     DECL_LINK( SplitRowHdl_Impl, TriStateBox* );
     DECL_LINK( HeadLineCBClickHdl, void* p = 0 );
 
+public:
     SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SwTextFlowPage();
-
-public:
-    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
+    virtual void dispose() SAL_OVERRIDE;
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet);
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;