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

diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 6824bed6f897..2f93a750f1b1 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -37,31 +37,31 @@ class SwMailMergeConfigItem;
 
 class SwMailMergeAddressBlockPage : public svt::OWizardPage
 {
-    PushButton*         m_pAddressListPB;
-    FixedText*          m_pCurrentAddressFI;
+    VclPtr<PushButton>         m_pAddressListPB;
+    VclPtr<FixedText>          m_pCurrentAddressFI;
 
-    VclContainer*       m_pStep2;
-    VclContainer*       m_pStep3;
-    VclContainer*       m_pStep4;
+    VclPtr<VclContainer>       m_pStep2;
+    VclPtr<VclContainer>       m_pStep3;
+    VclPtr<VclContainer>       m_pStep4;
 
-    FixedText*          m_pSettingsFI;
-    CheckBox*           m_pAddressCB;
-    SwAddressPreview*   m_pSettingsWIN;
-    PushButton*         m_pSettingsPB;
-    CheckBox*           m_pHideEmptyParagraphsCB;
+    VclPtr<FixedText>          m_pSettingsFI;
+    VclPtr<CheckBox>           m_pAddressCB;
+    VclPtr<SwAddressPreview>   m_pSettingsWIN;
+    VclPtr<PushButton>         m_pSettingsPB;
+    VclPtr<CheckBox>           m_pHideEmptyParagraphsCB;
 
-    PushButton*         m_pAssignPB;
+    VclPtr<PushButton>         m_pAssignPB;
 
-    SwAddressPreview*   m_pPreviewWIN;
-    FixedText*          m_pDocumentIndexFI;
-    PushButton*         m_pPrevSetIB;
-    PushButton*         m_pNextSetIB;
+    VclPtr<SwAddressPreview>   m_pPreviewWIN;
+    VclPtr<FixedText>          m_pDocumentIndexFI;
+    VclPtr<PushButton>         m_pPrevSetIB;
+    VclPtr<PushButton>         m_pNextSetIB;
 
     OUString            m_sDocument;
     OUString            m_sCurrentAddress;
     OUString            m_sChangeAddress;
 
-    SwMailMergeWizard*  m_pWizard;
+    VclPtr<SwMailMergeWizard>  m_pWizard;
 
     DECL_LINK(AddressListHdl_Impl, void *);
     DECL_LINK(SettingsHdl_Impl, PushButton*);
@@ -79,20 +79,22 @@ class SwMailMergeAddressBlockPage : public svt::OWizardPage
 
 public:
     SwMailMergeAddressBlockPage(SwMailMergeWizard* _pParent);
+    virtual ~SwMailMergeAddressBlockPage();
+    virtual void dispose() SAL_OVERRIDE;
     SwMailMergeWizard* GetWizard() { return m_pWizard; }
 };
 
 class SwSelectAddressBlockDialog : public SfxModalDialog
 {
-    SwAddressPreview*   m_pPreview;
-    PushButton*         m_pNewPB;
-    PushButton*         m_pCustomizePB;
-    PushButton*         m_pDeletePB;
+    VclPtr<SwAddressPreview>   m_pPreview;
+    VclPtr<PushButton>         m_pNewPB;
+    VclPtr<PushButton>         m_pCustomizePB;
+    VclPtr<PushButton>         m_pDeletePB;
 
-    RadioButton*        m_pNeverRB;
-    RadioButton*        m_pAlwaysRB;
-    RadioButton*        m_pDependentRB;
-    Edit*               m_pCountryED;
+    VclPtr<RadioButton>        m_pNeverRB;
+    VclPtr<RadioButton>        m_pAlwaysRB;
+    VclPtr<RadioButton>        m_pDependentRB;
+    VclPtr<Edit>               m_pCountryED;
 
     com::sun::star::uno::Sequence< OUString>    m_aAddressBlocks;
     SwMailMergeConfigItem& m_rConfig;
@@ -106,6 +108,7 @@ class SwSelectAddressBlockDialog : public SfxModalDialog
 public:
     SwSelectAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig);
     virtual ~SwSelectAddressBlockDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void    SetAddressBlocks(const com::sun::star::uno::Sequence< OUString>& rBlocks,
                                 sal_uInt16 nSelected);
@@ -119,9 +122,11 @@ public:
 class SwCustomizeAddressBlockDialog;
 class DDListBox : public SvTreeListBox
 {
-    SwCustomizeAddressBlockDialog*   m_pParentDialog;
+    VclPtr<SwCustomizeAddressBlockDialog>   m_pParentDialog;
 public:
     DDListBox(vcl::Window* pParent, const WinBits nStyle);
+    virtual ~DDListBox();
+    virtual void dispose() SAL_OVERRIDE;
 
     void SetAddressDialog(SwCustomizeAddressBlockDialog *pParent);
 
@@ -136,7 +141,7 @@ public:
 class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener
 {
     Link                            m_aSelectionLink;
-    SwCustomizeAddressBlockDialog*  m_pParentDialog;
+    VclPtr<SwCustomizeAddressBlockDialog>  m_pParentDialog;
 
     using VclMultiLineEdit::Notify;
 
@@ -147,6 +152,7 @@ protected:
 public:
     AddressMultiLineEdit(vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER);
     virtual ~AddressMultiLineEdit();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            SetAddressDialog(SwCustomizeAddressBlockDialog *pParent);
 
@@ -183,26 +189,26 @@ public:
         GREETING_MALE
     };
 private:
-    FixedText*              m_pAddressElementsFT;
-    DDListBox*              m_pAddressElementsLB;
+    VclPtr<FixedText>              m_pAddressElementsFT;
+    VclPtr<DDListBox>              m_pAddressElementsLB;
 
-    PushButton*             m_pInsertFieldIB;
-    PushButton*             m_pRemoveFieldIB;
+    VclPtr<PushButton>             m_pInsertFieldIB;
+    VclPtr<PushButton>             m_pRemoveFieldIB;
 
-    FixedText*              m_pDragFT;
-    AddressMultiLineEdit*   m_pDragED;
-    PushButton*             m_pUpIB;
-    PushButton*             m_pLeftIB;
-    PushButton*             m_pRightIB;
-    PushButton*             m_pDownIB;
+    VclPtr<FixedText>              m_pDragFT;
+    VclPtr<AddressMultiLineEdit>   m_pDragED;
+    VclPtr<PushButton>             m_pUpIB;
+    VclPtr<PushButton>             m_pLeftIB;
+    VclPtr<PushButton>             m_pRightIB;
+    VclPtr<PushButton>             m_pDownIB;
 
-    FixedText*              m_pFieldFT;
-    ComboBox*               m_pFieldCB;
+    VclPtr<FixedText>              m_pFieldFT;
+    VclPtr<ComboBox>               m_pFieldCB;
     TextFilter              m_aTextFilter;
 
-    SwAddressPreview*       m_pPreviewWIN;
+    VclPtr<SwAddressPreview>       m_pPreviewWIN;
 
-    OKButton*               m_pOK;
+    VclPtr<OKButton>               m_pOK;
 
     ::std::vector<OUString>   m_aSalutations;
     ::std::vector<OUString>   m_aPunctuations;
@@ -228,6 +234,7 @@ private:
 public:
     SwCustomizeAddressBlockDialog(vcl::Window* pParent, SwMailMergeConfigItem& rConfig, DialogType);
     virtual ~SwCustomizeAddressBlockDialog();
+    virtual void dispose() SAL_OVERRIDE;
 
     void            SetAddress(const OUString& rAddress);
     OUString GetAddress();
@@ -236,14 +243,13 @@ public:
 class SwAssignFieldsControl;
 class SwAssignFieldsDialog : public SfxModalDialog
 {
-    FixedText               *m_pMatchingFI;
-    SwAssignFieldsControl   *m_pFieldsControl;
+    VclPtr<FixedText>               m_pMatchingFI;
+    VclPtr<SwAssignFieldsControl>   m_pFieldsControl;
 
-    FixedText               *m_pPreviewFI;
-    SwAddressPreview        *m_pPreviewWIN;
+    VclPtr<FixedText>               m_pPreviewFI;
+    VclPtr<SwAddressPreview>        m_pPreviewWIN;
 
-
-    OKButton                *m_pOK;
+    VclPtr<OKButton>                m_pOK;
 
     OUString                m_sNone;
     OUString                m_rPreviewString;
@@ -260,6 +266,7 @@ public:
                 const OUString& rPreview,
                 bool bIsAddressBlock);
     virtual ~SwAssignFieldsDialog();
+    virtual void dispose() SAL_OVERRIDE;
 };
 #endif