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, 47 insertions, 46 deletions

diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 28778a16f783..f31c850a5eb7 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -31,31 +31,31 @@ class ScViewOptions;
 
 class ScTpContentOptions : public SfxTabPage
 {
-    ListBox*         pGridLB;
-    FixedText*       pColorFT;
-    ColorListBox*    pColorLB;
-    CheckBox*        pBreakCB;
-    CheckBox*        pGuideLineCB;
-
-    CheckBox*        pFormulaCB;
-    CheckBox*        pNilCB;
-    CheckBox*        pAnnotCB;
-    CheckBox*        pValueCB;
-    CheckBox*        pAnchorCB;
-    CheckBox*        pClipMarkCB;
-    CheckBox*        pRangeFindCB;
-
-    ListBox*         pObjGrfLB;
-    ListBox*         pDiagramLB;
-    ListBox*         pDrawLB;
-
-    CheckBox*        pSyncZoomCB;
-
-    CheckBox*        pRowColHeaderCB;
-    CheckBox*        pHScrollCB;
-    CheckBox*        pVScrollCB;
-    CheckBox*        pTblRegCB;
-    CheckBox*        pOutlineCB;
+    VclPtr<ListBox>         pGridLB;
+    VclPtr<FixedText>       pColorFT;
+    VclPtr<ColorListBox>    pColorLB;
+    VclPtr<CheckBox>        pBreakCB;
+    VclPtr<CheckBox>        pGuideLineCB;
+
+    VclPtr<CheckBox>        pFormulaCB;
+    VclPtr<CheckBox>        pNilCB;
+    VclPtr<CheckBox>        pAnnotCB;
+    VclPtr<CheckBox>        pValueCB;
+    VclPtr<CheckBox>        pAnchorCB;
+    VclPtr<CheckBox>        pClipMarkCB;
+    VclPtr<CheckBox>        pRangeFindCB;
+
+    VclPtr<ListBox>         pObjGrfLB;
+    VclPtr<ListBox>         pDiagramLB;
+    VclPtr<ListBox>         pDrawLB;
+
+    VclPtr<CheckBox>        pSyncZoomCB;
+
+    VclPtr<CheckBox>        pRowColHeaderCB;
+    VclPtr<CheckBox>        pHScrollCB;
+    VclPtr<CheckBox>        pVScrollCB;
+    VclPtr<CheckBox>        pTblRegCB;
+    VclPtr<CheckBox>        pOutlineCB;
 
     ScViewOptions*  pLocalOptions;
 
@@ -67,9 +67,10 @@ class ScTpContentOptions : public SfxTabPage
             ScTpContentOptions( vcl::Window*         pParent,
                              const SfxItemSet&  rArgSet );
             virtual ~ScTpContentOptions();
+    virtual void dispose() SAL_OVERRIDE;
 
 public:
-    static  SfxTabPage* Create          ( vcl::Window*               pParent,
+    static  VclPtr<SfxTabPage> Create          ( vcl::Window*               pParent,
                                           const SfxItemSet*     rCoreSet );
     virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
     virtual void        Reset           ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
@@ -83,23 +84,23 @@ public:
 class ScDocument;
 class ScTpLayoutOptions : public SfxTabPage
 {
-    ListBox*        m_pUnitLB;
-    MetricField*    m_pTabMF;
-
-    RadioButton*    m_pAlwaysRB;
-    RadioButton*    m_pRequestRB;
-    RadioButton*    m_pNeverRB;
-
-    CheckBox*       m_pAlignCB;
-    ListBox*        m_pAlignLB;
-    CheckBox*       m_pEditModeCB;
-    CheckBox*       m_pFormatCB;
-    CheckBox*       m_pExpRefCB;
-    CheckBox*       m_pSortRefUpdateCB;
-    CheckBox*       m_pMarkHdrCB;
-    CheckBox*       m_pTextFmtCB;
-    CheckBox*       m_pReplWarnCB;
-    CheckBox*       m_pLegacyCellSelectionCB;
+    VclPtr<ListBox>        m_pUnitLB;
+    VclPtr<MetricField>    m_pTabMF;
+
+    VclPtr<RadioButton>    m_pAlwaysRB;
+    VclPtr<RadioButton>    m_pRequestRB;
+    VclPtr<RadioButton>    m_pNeverRB;
+
+    VclPtr<CheckBox>       m_pAlignCB;
+    VclPtr<ListBox>        m_pAlignLB;
+    VclPtr<CheckBox>       m_pEditModeCB;
+    VclPtr<CheckBox>       m_pFormatCB;
+    VclPtr<CheckBox>       m_pExpRefCB;
+    VclPtr<CheckBox>       m_pSortRefUpdateCB;
+    VclPtr<CheckBox>       m_pMarkHdrCB;
+    VclPtr<CheckBox>       m_pTextFmtCB;
+    VclPtr<CheckBox>       m_pReplWarnCB;
+    VclPtr<CheckBox>       m_pLegacyCellSelectionCB;
 
     SvxStringArray  aUnitArr;
 
@@ -114,10 +115,10 @@ class ScTpLayoutOptions : public SfxTabPage
 
             ScTpLayoutOptions( vcl::Window*          pParent,
                              const SfxItemSet&  rArgSet );
-            virtual ~ScTpLayoutOptions();
-
 public:
-    static  SfxTabPage* Create          ( vcl::Window*               pParent,
+    virtual ~ScTpLayoutOptions();
+    virtual void        dispose() SAL_OVERRIDE;
+    static  VclPtr<SfxTabPage> Create          ( vcl::Window*               pParent,
                                           const SfxItemSet*     rCoreSet );
     virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
     virtual void        Reset           ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;