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, 88 deletions

diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index f538f7d53aed..04c166228a94 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -60,108 +60,108 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DWin : public SfxDockingWindow
     using Window::Update;
 
 private:
-    PushButton*         m_pBtnGeo;
-    PushButton*         m_pBtnRepresentation;
-    PushButton*         m_pBtnLight;
-    PushButton*         m_pBtnTexture;
-    PushButton*         m_pBtnMaterial;
-    PushButton*         m_pBtnUpdate;
-    PushButton*         m_pBtnAssign;
+    VclPtr<PushButton>         m_pBtnGeo;
+    VclPtr<PushButton>         m_pBtnRepresentation;
+    VclPtr<PushButton>         m_pBtnLight;
+    VclPtr<PushButton>         m_pBtnTexture;
+    VclPtr<PushButton>         m_pBtnMaterial;
+    VclPtr<PushButton>         m_pBtnUpdate;
+    VclPtr<PushButton>         m_pBtnAssign;
 
 // geometry
-    VclContainer*       m_pFLGeometrie;
-    FixedText*          m_pFtPercentDiagonal;
-    MetricField*        m_pMtrPercentDiagonal;
-    FixedText*          m_pFtBackscale;
-    MetricField*        m_pMtrBackscale;
-    FixedText*          m_pFtEndAngle;
-    MetricField*        m_pMtrEndAngle;
-    FixedText*          m_pFtDepth;
-    MetricField*        m_pMtrDepth;
-
-    VclContainer*       m_pFLSegments;
-    NumericField*       m_pNumHorizontal;
-    NumericField*       m_pNumVertical;
-
-    VclContainer*       m_pFLNormals;
-    PushButton*         m_pBtnNormalsObj;
-    PushButton*         m_pBtnNormalsFlat;
-    PushButton*         m_pBtnNormalsSphere;
-    PushButton*         m_pBtnNormalsInvert;
-    PushButton*         m_pBtnTwoSidedLighting;
-    PushButton*         m_pBtnDoubleSided;
+    VclPtr<VclContainer>       m_pFLGeometrie;
+    VclPtr<FixedText>          m_pFtPercentDiagonal;
+    VclPtr<MetricField>        m_pMtrPercentDiagonal;
+    VclPtr<FixedText>          m_pFtBackscale;
+    VclPtr<MetricField>        m_pMtrBackscale;
+    VclPtr<FixedText>          m_pFtEndAngle;
+    VclPtr<MetricField>        m_pMtrEndAngle;
+    VclPtr<FixedText>          m_pFtDepth;
+    VclPtr<MetricField>        m_pMtrDepth;
+
+    VclPtr<VclContainer>       m_pFLSegments;
+    VclPtr<NumericField>       m_pNumHorizontal;
+    VclPtr<NumericField>       m_pNumVertical;
+
+    VclPtr<VclContainer>       m_pFLNormals;
+    VclPtr<PushButton>         m_pBtnNormalsObj;
+    VclPtr<PushButton>         m_pBtnNormalsFlat;
+    VclPtr<PushButton>         m_pBtnNormalsSphere;
+    VclPtr<PushButton>         m_pBtnNormalsInvert;
+    VclPtr<PushButton>         m_pBtnTwoSidedLighting;
+    VclPtr<PushButton>         m_pBtnDoubleSided;
 
 // presentation
-    VclContainer*       m_pFLRepresentation;
-    ListBox*            m_pLbShademode;
+    VclPtr<VclContainer>       m_pFLRepresentation;
+    VclPtr<ListBox>            m_pLbShademode;
 
-    VclContainer*       m_pFLShadow;
-    PushButton*         m_pBtnShadow3d;
-    FixedText*          m_pFtSlant;
-    MetricField*        m_pMtrSlant;
+    VclPtr<VclContainer>       m_pFLShadow;
+    VclPtr<PushButton>         m_pBtnShadow3d;
+    VclPtr<FixedText>          m_pFtSlant;
+    VclPtr<MetricField>        m_pMtrSlant;
 
-    VclContainer*       m_pFLCamera;
-    MetricField*        m_pMtrDistance;
-    MetricField*        m_pMtrFocalLength;
+    VclPtr<VclContainer>       m_pFLCamera;
+    VclPtr<MetricField>        m_pMtrDistance;
+    VclPtr<MetricField>        m_pMtrFocalLength;
 
 // lighting
-    VclContainer*       m_pFLLight;
-    PushButton*         m_pBtnLight1;
-    PushButton*         m_pBtnLight2;
-    PushButton*         m_pBtnLight3;
-    PushButton*         m_pBtnLight4;
-    PushButton*         m_pBtnLight5;
-    PushButton*         m_pBtnLight6;
-    PushButton*         m_pBtnLight7;
-    PushButton*         m_pBtnLight8;
-    ColorLB*            m_pLbLight1;
-    ColorLB*            m_pLbLight2;
-    ColorLB*            m_pLbLight3;
-    ColorLB*            m_pLbLight4;
-    ColorLB*            m_pLbLight5;
-    ColorLB*            m_pLbLight6;
-    ColorLB*            m_pLbLight7;
-    ColorLB*            m_pLbLight8;
-    PushButton*         m_pBtnLightColor;
-    ColorLB*            m_pLbAmbientlight;    // ListBox
-    PushButton*         m_pBtnAmbientColor;   // color button
+    VclPtr<VclContainer>       m_pFLLight;
+    VclPtr<PushButton>         m_pBtnLight1;
+    VclPtr<PushButton>         m_pBtnLight2;
+    VclPtr<PushButton>         m_pBtnLight3;
+    VclPtr<PushButton>         m_pBtnLight4;
+    VclPtr<PushButton>         m_pBtnLight5;
+    VclPtr<PushButton>         m_pBtnLight6;
+    VclPtr<PushButton>         m_pBtnLight7;
+    VclPtr<PushButton>         m_pBtnLight8;
+    VclPtr<ColorLB>            m_pLbLight1;
+    VclPtr<ColorLB>            m_pLbLight2;
+    VclPtr<ColorLB>            m_pLbLight3;
+    VclPtr<ColorLB>            m_pLbLight4;
+    VclPtr<ColorLB>            m_pLbLight5;
+    VclPtr<ColorLB>            m_pLbLight6;
+    VclPtr<ColorLB>            m_pLbLight7;
+    VclPtr<ColorLB>            m_pLbLight8;
+    VclPtr<PushButton>         m_pBtnLightColor;
+    VclPtr<ColorLB>            m_pLbAmbientlight;    // ListBox
+    VclPtr<PushButton>         m_pBtnAmbientColor;   // color button
 
 // Textures
-    VclContainer*       m_pFLTexture;
-    PushButton*         m_pBtnTexLuminance;
-    PushButton*         m_pBtnTexColor;
-    PushButton*         m_pBtnTexReplace;
-    PushButton*         m_pBtnTexModulate;
-    PushButton*         m_pBtnTexBlend;
-    PushButton*         m_pBtnTexObjectX;
-    PushButton*         m_pBtnTexParallelX;
-    PushButton*         m_pBtnTexCircleX;
-    PushButton*         m_pBtnTexObjectY;
-    PushButton*         m_pBtnTexParallelY;
-    PushButton*         m_pBtnTexCircleY;
-    PushButton*         m_pBtnTexFilter;
+    VclPtr<VclContainer>       m_pFLTexture;
+    VclPtr<PushButton>         m_pBtnTexLuminance;
+    VclPtr<PushButton>         m_pBtnTexColor;
+    VclPtr<PushButton>         m_pBtnTexReplace;
+    VclPtr<PushButton>         m_pBtnTexModulate;
+    VclPtr<PushButton>         m_pBtnTexBlend;
+    VclPtr<PushButton>         m_pBtnTexObjectX;
+    VclPtr<PushButton>         m_pBtnTexParallelX;
+    VclPtr<PushButton>         m_pBtnTexCircleX;
+    VclPtr<PushButton>         m_pBtnTexObjectY;
+    VclPtr<PushButton>         m_pBtnTexParallelY;
+    VclPtr<PushButton>         m_pBtnTexCircleY;
+    VclPtr<PushButton>         m_pBtnTexFilter;
 
 // material
 // material editor
-    VclContainer*       m_pFLMaterial;
-    ListBox*            m_pLbMatFavorites;
-    ColorLB*            m_pLbMatColor;
-    PushButton*         m_pBtnMatColor;
-    ColorLB*            m_pLbMatEmission;
-    PushButton*         m_pBtnEmissionColor;
+    VclPtr<VclContainer>       m_pFLMaterial;
+    VclPtr<ListBox>            m_pLbMatFavorites;
+    VclPtr<ColorLB>            m_pLbMatColor;
+    VclPtr<PushButton>         m_pBtnMatColor;
+    VclPtr<ColorLB>            m_pLbMatEmission;
+    VclPtr<PushButton>         m_pBtnEmissionColor;
 
-    VclContainer*       m_pFLMatSpecular;
-    ColorLB*            m_pLbMatSpecular;
-    PushButton*         m_pBtnSpecularColor;
-    MetricField*        m_pMtrMatSpecularIntensity;
+    VclPtr<VclContainer>       m_pFLMatSpecular;
+    VclPtr<ColorLB>            m_pLbMatSpecular;
+    VclPtr<PushButton>         m_pBtnSpecularColor;
+    VclPtr<MetricField>        m_pMtrMatSpecularIntensity;
 
-    Svx3DPreviewControl* m_pCtlPreview;
-    SvxLightCtl3D*      m_pCtlLightPreview;
+    VclPtr<Svx3DPreviewControl> m_pCtlPreview;
+    VclPtr<SvxLightCtl3D>      m_pCtlLightPreview;
 
 // bottom part
-    PushButton*         m_pBtnConvertTo3D;
-    PushButton*         m_pBtnLatheObject;
-    PushButton*         m_pBtnPerspective;
+    VclPtr<PushButton>         m_pBtnConvertTo3D;
+    VclPtr<PushButton>         m_pBtnLatheObject;
+    VclPtr<PushButton>         m_pBtnPerspective;
 
 // the rest ...
     Image               aImgLightOn;
@@ -171,7 +171,7 @@ private:
 
     // Model, Page, View etc. for favourites
     FmFormModel*        pModel;
-    VirtualDevice*      pVDev;
+    VclPtr<VirtualDevice> pVDev;
     E3dView*            p3DView;
 
     SfxBindings*                pBindings;
@@ -189,8 +189,6 @@ private:
 
     bool                bOnly3DChanged;
 
-
-
     DECL_LINK( ClickViewTypeHdl, void * );
     DECL_LINK( ClickUpdateHdl, void * );
     DECL_LINK( ClickAssignHdl, void * );
@@ -220,6 +218,7 @@ public:
             Svx3DWin( SfxBindings* pBindings, SfxChildWindow *pCW,
                         vcl::Window* pParent );
             virtual ~Svx3DWin();
+    virtual void dispose() SAL_OVERRIDE;
 
     void    InitColorLB( const SdrModel* pDoc );
     bool    IsUpdateMode() const { return bUpdate; }