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, 87 insertions, 81 deletions

diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 739249fbde20..108f9e3bea39 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -90,7 +90,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
-    SvxNumValueSet*         m_pExamplesVS;
+    VclPtr<SvxNumValueSet>         m_pExamplesVS;
     SvxNumSettingsArr_Impl  aNumSettingsArr;
     SvxNumRule*             pActNum;
     SvxNumRule*             pSaveNum;
@@ -101,16 +101,17 @@ class SvxSingleNumPickTabPage : public SfxTabPage
     OUString              sNumCharFmtName;
     sal_uInt16              nNumItemId;
 
-    protected:
+protected:
         DECL_LINK(NumSelectHdl_Impl, void *);
         DECL_LINK(DoubleClickHdl_Impl, void *);
 
-    public:
+public:
         SvxSingleNumPickTabPage(vcl::Window* pParent,
                                const SfxItemSet& rSet);
-        virtual ~SvxSingleNumPickTabPage();
+    virtual ~SvxSingleNumPickTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    static SfxTabPage*  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -129,7 +130,7 @@ class SvxBulletPickTabPage : public SfxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
-    SvxNumValueSet*     m_pExamplesVS;
+    VclPtr<SvxNumValueSet>     m_pExamplesVS;
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
     sal_uInt16              nActNumLvl;
@@ -138,15 +139,16 @@ class SvxBulletPickTabPage : public SfxTabPage
     sal_uInt16              nNumItemId;
 
     OUString            sBulletCharFmtName;
-    protected:
+protected:
         DECL_LINK(NumSelectHdl_Impl, void *);
         DECL_LINK(DoubleClickHdl_Impl, void *);
-    public:
+public:
         SvxBulletPickTabPage(vcl::Window* pParent,
                                const SfxItemSet& rSet);
-        virtual ~SvxBulletPickTabPage();
+    virtual ~SvxBulletPickTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    static SfxTabPage*  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -166,7 +168,7 @@ class SvxNumPickTabPage : public SfxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
-    SvxNumValueSet*     m_pExamplesVS;
+    VclPtr<SvxNumValueSet>     m_pExamplesVS;
     OUString            sNumCharFmtName;
     OUString            sBulletCharFmtName;
 
@@ -180,16 +182,17 @@ class SvxNumPickTabPage : public SfxTabPage
     bool                bPreset     : 1;
 
 
-    protected:
+protected:
         DECL_LINK(NumSelectHdl_Impl, void *);
         DECL_LINK(DoubleClickHdl_Impl, void *);
 
-    public:
-        SvxNumPickTabPage(vcl::Window* pParent,
+public:
+    SvxNumPickTabPage(vcl::Window* pParent,
                                const SfxItemSet& rSet);
-        virtual ~SvxNumPickTabPage();
+    virtual ~SvxNumPickTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    static SfxTabPage*  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -210,8 +213,8 @@ class SvxBitmapPickTabPage : public SfxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
-    FixedText*          m_pErrorText;
-    SvxBmpNumValueSet*  m_pExamplesVS;
+    VclPtr<FixedText>          m_pErrorText;
+    VclPtr<SvxBmpNumValueSet>  m_pExamplesVS;
 
     std::vector<OUString> aGrfNames;
     OUString            sNumCharFmtName;
@@ -224,17 +227,18 @@ class SvxBitmapPickTabPage : public SfxTabPage
     bool                bModified   : 1;
     bool                bPreset     : 1;
 
-    protected:
+protected:
         DECL_LINK(NumSelectHdl_Impl, void *);
         DECL_LINK(DoubleClickHdl_Impl, void *);
         DECL_LINK(LinkBmpHdl_Impl, void *);
 
-    public:
+public:
         SvxBitmapPickTabPage(vcl::Window* pParent,
                                const SfxItemSet& rSet);
         virtual ~SvxBitmapPickTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    static SfxTabPage*  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -251,44 +255,44 @@ class SvxNumOptionsTabPage : public SfxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
-    ListBox*        m_pLevelLB;
-
-    ListBox*        m_pFmtLB;
-
-    FixedText*      m_pSeparatorFT;
-    FixedText*      m_pPrefixFT;
-    Edit*           m_pPrefixED;
-    FixedText*      m_pSuffixFT;
-    Edit*           m_pSuffixED;
-    FixedText*      m_pCharFmtFT;
-    ListBox*        m_pCharFmtLB;
-    FixedText*      m_pBulColorFT;
-    ColorListBox*   m_pBulColLB;
-    FixedText*      m_pBulRelSizeFT;
-    MetricField*    m_pBulRelSizeMF;
-    FixedText*      m_pAllLevelFT;
-    NumericField*   m_pAllLevelNF;
-    FixedText*      m_pStartFT;
-    NumericField*   m_pStartED;
-    FixedText*      m_pBulletFT;
-    PushButton*     m_pBulletPB;
-    FixedText*      m_pAlignFT;
-    ListBox*        m_pAlignLB;
-    FixedText*      m_pBitmapFT;
-    MenuButton*     m_pBitmapMB;
+    VclPtr<ListBox>        m_pLevelLB;
+
+    VclPtr<ListBox>        m_pFmtLB;
+
+    VclPtr<FixedText>      m_pSeparatorFT;
+    VclPtr<FixedText>      m_pPrefixFT;
+    VclPtr<Edit>           m_pPrefixED;
+    VclPtr<FixedText>      m_pSuffixFT;
+    VclPtr<Edit>           m_pSuffixED;
+    VclPtr<FixedText>      m_pCharFmtFT;
+    VclPtr<ListBox>        m_pCharFmtLB;
+    VclPtr<FixedText>      m_pBulColorFT;
+    VclPtr<ColorListBox>   m_pBulColLB;
+    VclPtr<FixedText>      m_pBulRelSizeFT;
+    VclPtr<MetricField>    m_pBulRelSizeMF;
+    VclPtr<FixedText>      m_pAllLevelFT;
+    VclPtr<NumericField>   m_pAllLevelNF;
+    VclPtr<FixedText>      m_pStartFT;
+    VclPtr<NumericField>   m_pStartED;
+    VclPtr<FixedText>      m_pBulletFT;
+    VclPtr<PushButton>     m_pBulletPB;
+    VclPtr<FixedText>      m_pAlignFT;
+    VclPtr<ListBox>        m_pAlignLB;
+    VclPtr<FixedText>      m_pBitmapFT;
+    VclPtr<MenuButton>     m_pBitmapMB;
     sal_uInt16      m_nGalleryId;
-    FixedText*      m_pWidthFT;
-    MetricField*    m_pWidthMF;
-    FixedText*      m_pHeightFT;
-    MetricField*    m_pHeightMF;
-    CheckBox*       m_pRatioCB;
-    FixedText*      m_pOrientFT;
-    ListBox*        m_pOrientLB;
+    VclPtr<FixedText>      m_pWidthFT;
+    VclPtr<MetricField>    m_pWidthMF;
+    VclPtr<FixedText>      m_pHeightFT;
+    VclPtr<MetricField>    m_pHeightMF;
+    VclPtr<CheckBox>       m_pRatioCB;
+    VclPtr<FixedText>      m_pOrientFT;
+    VclPtr<ListBox>        m_pOrientLB;
 
-    VclContainer*   m_pAllLevelsFrame;
-    CheckBox*       m_pSameLevelCB;
+    VclPtr<VclContainer>   m_pAllLevelsFrame;
+    VclPtr<CheckBox>       m_pSameLevelCB;
 
-    SvxNumberingPreview* m_pPreviewWIN;
+    VclPtr<SvxNumberingPreview> m_pPreviewWIN;
 
     OUString        m_sNumCharFmtName;
     OUString        m_sBulletCharFmtName;
@@ -341,12 +345,13 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
         DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* );
 
-    public:
+public:
         SvxNumOptionsTabPage(vcl::Window* pParent,
                                const SfxItemSet& rSet);
         virtual ~SvxNumOptionsTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    static SfxTabPage*  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
@@ -385,36 +390,36 @@ class SvxNumPositionTabPage : public SfxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 
-    ListBox*            m_pLevelLB;
+    VclPtr<ListBox>            m_pLevelLB;
 
     // former set of controls shown for numbering rules containing list level
     // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_WIDTH_AND_POSITION
-    FixedText*          m_pDistBorderFT;
-    MetricField*        m_pDistBorderMF;
-    CheckBox*           m_pRelativeCB;
-    FixedText*          m_pIndentFT;
-    MetricField*        m_pIndentMF;
-    FixedText*          m_pDistNumFT;
-    MetricField*        m_pDistNumMF;
-    FixedText*          m_pAlignFT;
-    ListBox*            m_pAlignLB;
+    VclPtr<FixedText>          m_pDistBorderFT;
+    VclPtr<MetricField>        m_pDistBorderMF;
+    VclPtr<CheckBox>           m_pRelativeCB;
+    VclPtr<FixedText>          m_pIndentFT;
+    VclPtr<MetricField>        m_pIndentMF;
+    VclPtr<FixedText>          m_pDistNumFT;
+    VclPtr<MetricField>        m_pDistNumMF;
+    VclPtr<FixedText>          m_pAlignFT;
+    VclPtr<ListBox>            m_pAlignLB;
 
     // new set of controls shown for numbering rules containing list level
     // attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT
-    FixedText*          m_pLabelFollowedByFT;
-    ListBox*            m_pLabelFollowedByLB;
-    FixedText*          m_pListtabFT;
-    MetricField*        m_pListtabMF;
-    FixedText*          m_pAlign2FT;
-    ListBox*            m_pAlign2LB;
-    FixedText*          m_pAlignedAtFT;
-    MetricField*        m_pAlignedAtMF;
-    FixedText*          m_pIndentAtFT;
-    MetricField*        m_pIndentAtMF;
+    VclPtr<FixedText>          m_pLabelFollowedByFT;
+    VclPtr<ListBox>            m_pLabelFollowedByLB;
+    VclPtr<FixedText>          m_pListtabFT;
+    VclPtr<MetricField>        m_pListtabMF;
+    VclPtr<FixedText>          m_pAlign2FT;
+    VclPtr<ListBox>            m_pAlign2LB;
+    VclPtr<FixedText>          m_pAlignedAtFT;
+    VclPtr<MetricField>        m_pAlignedAtMF;
+    VclPtr<FixedText>          m_pIndentAtFT;
+    VclPtr<MetricField>        m_pIndentAtMF;
 
-    PushButton*         m_pStandardPB;
+    VclPtr<PushButton>         m_pStandardPB;
 
-    SvxNumberingPreview* m_pPreviewWIN;
+    VclPtr<SvxNumberingPreview> m_pPreviewWIN;
 
     SvxNumRule*         pActNum;
     SvxNumRule*         pSaveNum;
@@ -448,13 +453,14 @@ public:
         SvxNumPositionTabPage(vcl::Window* pParent,
                                const SfxItemSet& rSet);
         virtual ~SvxNumPositionTabPage();
+    virtual void dispose() SAL_OVERRIDE;
 
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual sfxpg       DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
-    static SfxTabPage*  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
                                 const SfxItemSet* rAttrSet);
 
     void                SetMetric(FieldUnit eSet);