commit 25edbe68dbc50bc8cf543cd5d4b28184a36d1690
author Noel Grandin <noel@peralex.com> Fri Jan 16 15:30:06 2015 +0200
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 09 21:35:14 2015 +0100
tree 04c6c815155203022de01116678030a53aa9000e
parent 344f939e7d249e7188bc2d668de73c48bb38d4e5

vcl: VclPtr conversion in various

Change-Id: Id4f0cc26e4f5bda345f41130c9838fc44312e98e

basctl/source/basicide/baside2b.cxx

diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 0d1878a..605c1f4 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -271,6 +271,7 @@ void EditorWindow::dispose()
        EndListening( *pEditEngine );
        pEditEngine->RemoveView(pEditView.get());
    }
    vcl::Window::dispose();
}

OUString EditorWindow::GetWordAtCursor()
@@ -1683,6 +1684,7 @@ void WatchWindow::dispose()
    aHeaderBar.disposeAndClear();
    aTreeListBox.disposeAndClear();
    GetSystemWindow()->GetTaskPaneList()->RemoveWindow( this );
    DockingWindow::dispose();
}

include/dbaccess/dataview.hxx

diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index 8189cc9..d625097 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -38,7 +38,7 @@ namespace dbaui

    protected:
        IController&        m_rController;  // the controller in where we resides in
        FixedLine           m_aSeparator;
        VclPtr<FixedLine>   m_aSeparator;
        ::std::unique_ptr< ::svt::AcceleratorExecute> m_pAccel;

    public:
@@ -47,6 +47,7 @@ namespace dbaui
                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,
                    WinBits nStyle = 0 );
        virtual ~ODataView();
        virtual void dispose() SAL_OVERRIDE;

        /// late construction
        virtual void Construct();

svx/source/tbxctrls/tbcontrl.cxx

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 51cb5e1..55746fc5 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -279,7 +279,7 @@ protected:
public:
    SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow );
    virtual ~SvxLineWindow_Impl() { dispose(); }
    virtual void dispose() SAL_OVERRIDE { m_aLineStyleLb.disposeAndClear(); }
    virtual void dispose() SAL_OVERRIDE { m_aLineStyleLb.disposeAndClear(); SfxPopupWindow::dispose(); }
    virtual SfxPopupWindow* Clone() const SAL_OVERRIDE;
};