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, 100 insertions, 94 deletions

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 9a471ff3e048..fad03f168fe4 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -47,14 +47,12 @@ class FontList;
 class SvxCharBasePage : public SfxTabPage
 {
 protected:
-    SvxFontPrevWindow*  m_pPreviewWin;
+    VclPtr<SvxFontPrevWindow>  m_pPreviewWin;
 
     bool                m_bPreviewBackgroundToCharacter;
 
     SvxCharBasePage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset);
 
-    virtual             ~SvxCharBasePage();
-
     void SetPrevFontWidthScale( const SfxItemSet& rSet );
     void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
 
@@ -63,6 +61,9 @@ protected:
     inline SvxFont&     GetPreviewCTLFont();
 
 public:
+    virtual ~SvxCharBasePage();
+    virtual void dispose() SAL_OVERRIDE;
+
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
 
@@ -79,38 +80,38 @@ class SvxCharNamePage : public SvxCharBasePage
 
 private:
     static const sal_uInt16 pNameRanges[];
-    VclContainer*       m_pWestFrame;
-    FixedText*          m_pWestFontNameFT;
-    FontNameBox*        m_pWestFontNameLB;
-    FixedText*          m_pWestFontStyleFT;
-    FontStyleBox*       m_pWestFontStyleLB;
-    FixedText*          m_pWestFontSizeFT;
-    FontSizeBox*        m_pWestFontSizeLB;
-    FixedText*          m_pWestFontLanguageFT;
-    SvxLanguageComboBox* m_pWestFontLanguageLB;
-    FixedText*          m_pWestFontTypeFT;
-
-    VclContainer*       m_pEastFrame;
-    FixedText*          m_pEastFontNameFT;
-    FontNameBox*        m_pEastFontNameLB;
-    FixedText*          m_pEastFontStyleFT;
-    FontStyleBox*       m_pEastFontStyleLB;
-    FixedText*          m_pEastFontSizeFT;
-    FontSizeBox*        m_pEastFontSizeLB;
-    FixedText*          m_pEastFontLanguageFT;
-    SvxLanguageBox*     m_pEastFontLanguageLB;
-    FixedText*          m_pEastFontTypeFT;
-
-    VclContainer*       m_pCTLFrame;
-    FixedText*          m_pCTLFontNameFT;
-    FontNameBox*        m_pCTLFontNameLB;
-    FixedText*          m_pCTLFontStyleFT;
-    FontStyleBox*       m_pCTLFontStyleLB;
-    FixedText*          m_pCTLFontSizeFT;
-    FontSizeBox*        m_pCTLFontSizeLB;
-    FixedText*          m_pCTLFontLanguageFT;
-    SvxLanguageBox*     m_pCTLFontLanguageLB;
-    FixedText*          m_pCTLFontTypeFT;
+    VclPtr<VclContainer>       m_pWestFrame;
+    VclPtr<FixedText>          m_pWestFontNameFT;
+    VclPtr<FontNameBox>        m_pWestFontNameLB;
+    VclPtr<FixedText>          m_pWestFontStyleFT;
+    VclPtr<FontStyleBox>       m_pWestFontStyleLB;
+    VclPtr<FixedText>          m_pWestFontSizeFT;
+    VclPtr<FontSizeBox>        m_pWestFontSizeLB;
+    VclPtr<FixedText>          m_pWestFontLanguageFT;
+    VclPtr<SvxLanguageComboBox> m_pWestFontLanguageLB;
+    VclPtr<FixedText>          m_pWestFontTypeFT;
+
+    VclPtr<VclContainer>       m_pEastFrame;
+    VclPtr<FixedText>          m_pEastFontNameFT;
+    VclPtr<FontNameBox>        m_pEastFontNameLB;
+    VclPtr<FixedText>          m_pEastFontStyleFT;
+    VclPtr<FontStyleBox>       m_pEastFontStyleLB;
+    VclPtr<FixedText>          m_pEastFontSizeFT;
+    VclPtr<FontSizeBox>        m_pEastFontSizeLB;
+    VclPtr<FixedText>          m_pEastFontLanguageFT;
+    VclPtr<SvxLanguageBox>     m_pEastFontLanguageLB;
+    VclPtr<FixedText>          m_pEastFontTypeFT;
+
+    VclPtr<VclContainer>       m_pCTLFrame;
+    VclPtr<FixedText>          m_pCTLFontNameFT;
+    VclPtr<FontNameBox>        m_pCTLFontNameLB;
+    VclPtr<FixedText>          m_pCTLFontStyleFT;
+    VclPtr<FontStyleBox>       m_pCTLFontStyleLB;
+    VclPtr<FixedText>          m_pCTLFontSizeFT;
+    VclPtr<FontSizeBox>        m_pCTLFontSizeLB;
+    VclPtr<FixedText>          m_pCTLFontLanguageFT;
+    VclPtr<SvxLanguageBox>     m_pCTLFontLanguageLB;
+    VclPtr<FixedText>          m_pCTLFontTypeFT;
 
     SvxCharNamePage_Impl*   m_pImpl;
 
@@ -152,8 +153,9 @@ public:
 
 public:
                         virtual ~SvxCharNamePage();
+    virtual void        dispose() SAL_OVERRIDE;
 
-    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
     static const sal_uInt16* GetRanges() { return pNameRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -176,44 +178,43 @@ class SvxCharEffectsPage : public SvxCharBasePage
 
 private:
     static const sal_uInt16 pEffectsRanges[];
-    FixedText*          m_pFontColorFT;
-    ColorListBox*       m_pFontColorLB;
+    VclPtr<FixedText>          m_pFontColorFT;
+    VclPtr<ColorListBox>       m_pFontColorLB;
 
-    FixedText*          m_pEffectsFT;
-    ListBox*            m_pEffectsLB;
+    VclPtr<FixedText>          m_pEffectsFT;
+    VclPtr<ListBox>            m_pEffectsLB;
 
-    FixedText*          m_pReliefFT;
-    ListBox*            m_pReliefLB;
+    VclPtr<FixedText>          m_pReliefFT;
+    VclPtr<ListBox>            m_pReliefLB;
 
-    TriStateBox*        m_pOutlineBtn;
-    TriStateBox*        m_pShadowBtn;
-    TriStateBox*        m_pBlinkingBtn;
-    TriStateBox*        m_pHiddenBtn;
+    VclPtr<TriStateBox>        m_pOutlineBtn;
+    VclPtr<TriStateBox>        m_pShadowBtn;
+    VclPtr<TriStateBox>        m_pBlinkingBtn;
+    VclPtr<TriStateBox>        m_pHiddenBtn;
 
-    ListBox*            m_pOverlineLB;
-    FixedText*          m_pOverlineColorFT;
-    ColorListBox*       m_pOverlineColorLB;
+    VclPtr<ListBox>            m_pOverlineLB;
+    VclPtr<FixedText>          m_pOverlineColorFT;
+    VclPtr<ColorListBox>       m_pOverlineColorLB;
 
-    ListBox*            m_pStrikeoutLB;
+    VclPtr<ListBox>            m_pStrikeoutLB;
 
-    ListBox*            m_pUnderlineLB;
-    FixedText*          m_pUnderlineColorFT;
-    ColorListBox*       m_pUnderlineColorLB;
+    VclPtr<ListBox>            m_pUnderlineLB;
+    VclPtr<FixedText>          m_pUnderlineColorFT;
+    VclPtr<ColorListBox>       m_pUnderlineColorLB;
 
-    CheckBox*           m_pIndividualWordsBtn;
+    VclPtr<CheckBox>           m_pIndividualWordsBtn;
 
-    FixedText*          m_pEmphasisFT;
-    ListBox*            m_pEmphasisLB;
+    VclPtr<FixedText>          m_pEmphasisFT;
+    VclPtr<ListBox>            m_pEmphasisLB;
 
-    FixedText*          m_pPositionFT;
-    ListBox*            m_pPositionLB;
+    VclPtr<FixedText>          m_pPositionFT;
+    VclPtr<ListBox>            m_pPositionLB;
 
     sal_uInt16          m_nHtmlMode;
 
     OUString            m_aTransparentColorName;
 
                         SvxCharEffectsPage( vcl::Window* pParent, const SfxItemSet& rSet );
-                        virtual ~SvxCharEffectsPage();
 
     void                Initialize();
     void                UpdatePreview_Impl();
@@ -228,12 +229,14 @@ private:
     DECL_LINK(          ColorBoxSelectHdl_Impl, ColorListBox* );
 
 public:
-    using SfxTabPage::DeactivatePage;
+    virtual ~SvxCharEffectsPage();
+    virtual void dispose() SAL_OVERRIDE;
 
+    using SfxTabPage::DeactivatePage;
     virtual sfxpg       DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 
 public:
-    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
     static const sal_uInt16* GetRanges() { return pEffectsRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -254,30 +257,30 @@ class SvxCharPositionPage : public SvxCharBasePage
     static const sal_uInt16 pPositionRanges[];
 
 private:
-    RadioButton*        m_pHighPosBtn;
-    RadioButton*        m_pNormalPosBtn;
-    RadioButton*        m_pLowPosBtn;
-    FixedText*          m_pHighLowFT;
-    MetricField*        m_pHighLowMF;
-    CheckBox*           m_pHighLowRB;
-    FixedText*          m_pFontSizeFT;
-    MetricField*        m_pFontSizeMF;
-
-    VclContainer*       m_pRotationContainer;
-
-    FixedText*          m_pScalingFT;
-    FixedText*          m_pScalingAndRotationFT;
-    RadioButton*        m_p0degRB;
-    RadioButton*        m_p90degRB;
-    RadioButton*        m_p270degRB;
-    CheckBox*           m_pFitToLineCB;
-
-    MetricField*        m_pScaleWidthMF;
-
-    ListBox*            m_pKerningLB;
-    FixedText*          m_pKerningFT;
-    MetricField*        m_pKerningMF;
-    CheckBox*           m_pPairKerningBtn;
+    VclPtr<RadioButton>        m_pHighPosBtn;
+    VclPtr<RadioButton>        m_pNormalPosBtn;
+    VclPtr<RadioButton>        m_pLowPosBtn;
+    VclPtr<FixedText>          m_pHighLowFT;
+    VclPtr<MetricField>        m_pHighLowMF;
+    VclPtr<CheckBox>           m_pHighLowRB;
+    VclPtr<FixedText>          m_pFontSizeFT;
+    VclPtr<MetricField>        m_pFontSizeMF;
+
+    VclPtr<VclContainer>       m_pRotationContainer;
+
+    VclPtr<FixedText>          m_pScalingFT;
+    VclPtr<FixedText>          m_pScalingAndRotationFT;
+    VclPtr<RadioButton>        m_p0degRB;
+    VclPtr<RadioButton>        m_p90degRB;
+    VclPtr<RadioButton>        m_p270degRB;
+    VclPtr<CheckBox>           m_pFitToLineCB;
+
+    VclPtr<MetricField>        m_pScaleWidthMF;
+
+    VclPtr<ListBox>            m_pKerningLB;
+    VclPtr<FixedText>          m_pKerningFT;
+    VclPtr<MetricField>        m_pKerningMF;
+    VclPtr<CheckBox>           m_pPairKerningBtn;
 
     short               m_nSuperEsc;
     short               m_nSubEsc;
@@ -289,7 +292,6 @@ private:
     sal_uInt8                m_nSubProp;
 
                         SvxCharPositionPage( vcl::Window* pParent, const SfxItemSet& rSet );
-                        virtual ~SvxCharPositionPage();
 
     void                Initialize();
     void                UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
@@ -307,6 +309,9 @@ private:
     DECL_LINK(ScaleWidthModifyHdl_Impl, void *);
 
 public:
+    virtual ~SvxCharPositionPage();
+    virtual void dispose() SAL_OVERRIDE;
+
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
 
@@ -314,7 +319,7 @@ public:
     virtual void        ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
 
 public:
-    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
     static const sal_uInt16*      GetRanges() { return pPositionRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
@@ -331,16 +336,15 @@ class SvxCharTwoLinesPage : public SvxCharBasePage
 {
 private:
     static const sal_uInt16 pTwoLinesRanges[];
-    CheckBox*           m_pTwoLinesBtn;
-    VclContainer*       m_pEnclosingFrame;
-    ListBox*            m_pStartBracketLB;
-    ListBox*            m_pEndBracketLB;
+    VclPtr<CheckBox>           m_pTwoLinesBtn;
+    VclPtr<VclContainer>       m_pEnclosingFrame;
+    VclPtr<ListBox>            m_pStartBracketLB;
+    VclPtr<ListBox>            m_pEndBracketLB;
 
     sal_uInt16              m_nStartBracketPosition;
     sal_uInt16              m_nEndBracketPosition;
 
     SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    virtual ~SvxCharTwoLinesPage();
 
     void                UpdatePreview_Impl();
     void                Initialize();
@@ -351,14 +355,16 @@ private:
     DECL_LINK(          CharacterMapHdl_Impl, ListBox* );
 
 public:
+    virtual ~SvxCharTwoLinesPage();
+    virtual void dispose() SAL_OVERRIDE;
+
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
 
     virtual void        ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual sfxpg       DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
 
-public:
-    static SfxTabPage*  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
     static const sal_uInt16*  GetRanges() { return pTwoLinesRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;