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, 41 insertions, 31 deletions

diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index a5c3b91fc29e..2d5afed4fb17 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -109,7 +109,7 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
     GetComponentInterface(bool bCreate = true) SAL_OVERRIDE;
     CodeCompleteDataCache aCodeCompleteCache;
-    boost::scoped_ptr< CodeCompleteWindow > pCodeCompleteWnd;
+    VclPtr<CodeCompleteWindow> pCodeCompleteWnd;
     OUString GetActualSubName( sal_uLong nLine ); // gets the actual subroutine name according to line number
     void SetupAndShowCodeCompleteWnd(const std::vector< OUString >& aEntryVect, TextSelection aSel );
     void HandleAutoCorrect();
@@ -137,6 +137,7 @@ protected:
 public:
                     EditorWindow (vcl::Window* pParent, ModulWindow*);
                     virtual ~EditorWindow();
+    virtual void    dispose() SAL_OVERRIDE;
 
     ExtTextEngine*  GetEditEngine() const   { return pEditEngine.get(); }
     ExtTextView*    GetEditView() const     { return pEditView.get(); }
@@ -186,7 +187,6 @@ protected:
 
 public:
                     BreakPointWindow (vcl::Window* pParent, ModulWindow*);
-                    virtual ~BreakPointWindow();
 
     void            SetMarkerPos( sal_uInt16 nLine, bool bErrorMarker = false );
     void            SetNoMarker ();
@@ -211,6 +211,7 @@ protected:
 public:
     WatchTreeListBox( vcl::Window* pParent, WinBits nWinBits );
     virtual ~WatchTreeListBox();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            RequestingChildren( SvTreeListEntry * pParent ) SAL_OVERRIDE;
     void            UpdateWatches( bool bBasicStopped = false );
@@ -225,10 +226,10 @@ class WatchWindow : public DockingWindow
 {
 private:
     OUString            aWatchStr;
-    ExtendedEdit        aXEdit;
-    ImageButton         aRemoveWatchButton;
-    WatchTreeListBox    aTreeListBox;
-    HeaderBar           aHeaderBar;
+    VclPtr<ExtendedEdit>        aXEdit;
+    VclPtr<ImageButton>         aRemoveWatchButton;
+    VclPtr<WatchTreeListBox>    aTreeListBox;
+    VclPtr<HeaderBar>           aHeaderBar;
 
 protected:
     virtual void    Resize() SAL_OVERRIDE;
@@ -243,20 +244,21 @@ protected:
 public:
                     WatchWindow (Layout* pParent);
                     virtual ~WatchWindow();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            AddWatch( const OUString& rVName );
     bool            RemoveSelectedWatch();
     void            UpdateWatches( bool bBasicStopped = false );
 
-    WatchTreeListBox&   GetWatchTreeListBox() { return aTreeListBox; }
+    WatchTreeListBox&   GetWatchTreeListBox() { return *aTreeListBox.get(); }
 };
 
 
 class StackWindow : public DockingWindow
 {
 private:
-    SvTreeListBox   aTreeListBox;
-    OUString        aStackStr;
+    VclPtr<SvTreeListBox>  aTreeListBox;
+    OUString               aStackStr;
 
 protected:
     virtual void    Resize() SAL_OVERRIDE;
@@ -265,6 +267,7 @@ protected:
 public:
                     StackWindow (Layout* pParent);
                     virtual ~StackWindow();
+    virtual void    dispose() SAL_OVERRIDE;
 
     void            UpdateCalls();
 };
@@ -273,10 +276,10 @@ public:
 class ComplexEditorWindow : public vcl::Window
 {
 private:
-    BreakPointWindow    aBrkWindow;
-    LineNumberWindow    aLineNumberWindow;
-    EditorWindow        aEdtWindow;
-    ScrollBar           aEWVScrollBar;
+    VclPtr<BreakPointWindow> aBrkWindow;
+    VclPtr<LineNumberWindow> aLineNumberWindow;
+    VclPtr<EditorWindow>     aEdtWindow;
+    VclPtr<ScrollBar>        aEWVScrollBar;
 
     virtual void DataChanged(DataChangedEvent const & rDCEvt) SAL_OVERRIDE;
 
@@ -286,11 +289,12 @@ protected:
 
 public:
                         ComplexEditorWindow( ModulWindow* pParent );
-
-    BreakPointWindow&   GetBrkWindow()      { return aBrkWindow; }
-    LineNumberWindow&   GetLineNumberWindow() { return aLineNumberWindow; }
-    EditorWindow&       GetEdtWindow()      { return aEdtWindow; }
-    ScrollBar&          GetEWVScrollBar()   { return aEWVScrollBar; }
+    virtual             ~ComplexEditorWindow();
+    virtual void        dispose() SAL_OVERRIDE;
+    BreakPointWindow&   GetBrkWindow()      { return *aBrkWindow.get(); }
+    LineNumberWindow&   GetLineNumberWindow() { return *aLineNumberWindow.get(); }
+    EditorWindow&       GetEdtWindow()      { return *aEdtWindow.get(); }
+    ScrollBar&          GetEWVScrollBar()   { return *aEWVScrollBar.get(); }
 
     void SetLineNumberDisplay(bool b);
 };
@@ -302,7 +306,7 @@ private:
     ModulWindowLayout&  rLayout;
     StarBASICRef        xBasic;
     short               nValid;
-    ComplexEditorWindow aXEditorWindow;
+    VclPtr<ComplexEditorWindow> aXEditorWindow;
     BasicStatus         aStatus;
     SbModuleRef         xModule;
     OUString            aCurPath;
@@ -328,6 +332,7 @@ public:
     ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, OUString& aModule );
 
                     virtual ~ModulWindow();
+    virtual void    dispose() SAL_OVERRIDE;
 
     virtual void    ExecuteCommand (SfxRequest& rReq) SAL_OVERRIDE;
     virtual void    ExecuteGlobal (SfxRequest& rReq) SAL_OVERRIDE;
@@ -386,10 +391,10 @@ public:
     virtual SearchOptionFlags GetSearchOptions() SAL_OVERRIDE;
     virtual sal_uInt16  StartSearchAndReplace (SvxSearchItem const&, bool bFromStart = false) SAL_OVERRIDE;
 
-    EditorWindow&       GetEditorWindow()       { return aXEditorWindow.GetEdtWindow(); }
-    BreakPointWindow&   GetBreakPointWindow()   { return aXEditorWindow.GetBrkWindow(); }
-    LineNumberWindow&   GetLineNumberWindow()   { return aXEditorWindow.GetLineNumberWindow(); }
-    ScrollBar&          GetEditVScrollBar()     { return aXEditorWindow.GetEWVScrollBar(); }
+    EditorWindow&       GetEditorWindow()       { return aXEditorWindow->GetEdtWindow(); }
+    BreakPointWindow&   GetBreakPointWindow()   { return aXEditorWindow->GetBrkWindow(); }
+    LineNumberWindow&   GetLineNumberWindow()   { return aXEditorWindow->GetLineNumberWindow(); }
+    ScrollBar&          GetEditVScrollBar()     { return aXEditorWindow->GetEWVScrollBar(); }
     ExtTextEngine*      GetEditEngine()         { return GetEditorWindow().GetEditEngine(); }
     ExtTextView*        GetEditView()           { return GetEditorWindow().GetEditView(); }
     BreakPointList&     GetBreakPoints()        { return GetBreakPointWindow().GetBreakPoints(); }
@@ -419,6 +424,8 @@ class ModulWindowLayout: public Layout
 {
 public:
     ModulWindowLayout (vcl::Window* pParent, ObjectCatalog&);
+    virtual ~ModulWindowLayout();
+    virtual void dispose() SAL_OVERRIDE;
 public:
     // Layout:
     virtual void Activating (BaseWindow&) SAL_OVERRIDE;
@@ -438,10 +445,10 @@ protected:
 
 private:
     // main child window
-    ModulWindow* pChild;
+    VclPtr<ModulWindow> pChild;
     // dockable windows
-    WatchWindow aWatchWindow;
-    StackWindow aStackWindow;
+    VclPtr<WatchWindow> aWatchWindow;
+    VclPtr<StackWindow> aStackWindow;
     ObjectCatalog& rObjectCatalog;
 private:
     virtual void DataChanged (DataChangedEvent const& rDCEvt) SAL_OVERRIDE;
@@ -468,7 +475,7 @@ private:
         // the configuration
         svtools::ColorConfig aConfig;
         // the active editor
-        EditorWindow* pEditor;
+        VclPtr<EditorWindow> pEditor;
 
     } aSyntaxColors;
 };
@@ -482,7 +489,7 @@ private:
     /* a buffer to build up function name when typing
      * a function name, used for showing/hiding listbox values
      * */
-    CodeCompleteWindow* pCodeCompleteWindow; // parent window
+    VclPtr<CodeCompleteWindow> pCodeCompleteWindow; // parent window
 
     void SetMatchingEntries(); // sets the visible entries based on aFuncBuffer variable
     void HideAndRestoreFocus();
@@ -490,6 +497,8 @@ private:
 
 public:
     CodeCompleteListBox( CodeCompleteWindow* pPar );
+    virtual ~CodeCompleteListBox();
+    virtual void dispose() SAL_OVERRIDE;
     void InsertSelectedEntry(); //insert the selected entry
 
     DECL_LINK(ImplDoubleClickHdl, void*);
@@ -503,15 +512,16 @@ class CodeCompleteWindow: public vcl::Window
 {
 friend class CodeCompleteListBox;
 private:
-    EditorWindow* pParent; // parent window
+    VclPtr<EditorWindow> pParent; // parent window
     TextSelection aTextSelection;
-    CodeCompleteListBox* pListBox;
+    VclPtr<CodeCompleteListBox> pListBox;
 
     void InitListBox(); // initialize the ListBox
 
 public:
     CodeCompleteWindow( EditorWindow* pPar );
-    virtual ~CodeCompleteWindow(){ delete pListBox; }
+    virtual ~CodeCompleteWindow();
+    virtual void dispose() SAL_OVERRIDE;
 
     void InsertEntry( const OUString& aStr );
     void ClearListBox();