commit 33d7f6dcfee48a33ce34e483a4249f0be0ffa4fe
author Noel Grandin <noel@peralex.com> Mon Jan 26 13:11:36 2015 +0200
committer Michael Meeks <michael.meeks@collabora.com> Thu Apr 09 21:35:45 2015 +0100
tree af8c87018918b3c1a6605d4a52a0ad2dd11473d9
parent 1139e549240e2a02962360aadca227753d73a78c

vcl: VclPtr conversion in formula

Change-Id: I6f9571a3ef1fbe5bb42ef665d85425b9902c1925

formula/source/ui/dlg/ControlHelper.hxx

diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 4c7e564..574c853 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -48,6 +48,7 @@ public:
                    EditBox( vcl::Window* pParent, WinBits nBits );

                    virtual ~EditBox();
    virtual void    dispose() SAL_OVERRIDE;

    MultiLineEdit*  GetEdit() {return pMEdit;}

formula/source/ui/dlg/funcutl.cxx

diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index d6313d4..ff60bc9 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -361,10 +361,16 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeEditBox(vcl::Window *p

EditBox::~EditBox()
{
    dispose();
}

void EditBox::dispose()
{
    MultiLineEdit* pTheEdit=pMEdit;
    pMEdit->Disable();
    pMEdit=NULL;
    delete pTheEdit;
    Control::dispose();
}

// When the selection is changed this function will be called
@@ -481,8 +487,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *p

RefEdit::~RefEdit()
{
    dispose();
}

void RefEdit::dispose()
{
    aIdle.SetIdleHdl( Link() );
    aIdle.Stop();
    Edit::dispose();
}

void RefEdit::SetRefString( const OUString& rStr )

formula/source/ui/dlg/parawin.cxx

diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 9e3a647..cff293a 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -221,6 +221,11 @@ void ParaWin::UpdateArgInput( sal_uInt16 nOffset, sal_uInt16 i )

ParaWin::~ParaWin()
{
    dispose();
}

void ParaWin::dispose()
{
    // #i66422# if the focus changes during destruction of the controls,
    // don't call the focus handlers
    Link aEmptyLink;
@@ -228,6 +233,7 @@ ParaWin::~ParaWin()
    m_pBtnFx2->SetGetFocusHdl( aEmptyLink );
    m_pBtnFx3->SetGetFocusHdl( aEmptyLink );
    m_pBtnFx4->SetGetFocusHdl( aEmptyLink );
    TabPage::dispose();
}

formula/source/ui/dlg/parawin.hxx

diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 5bf159b..c885d16 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -125,6 +125,7 @@ protected:
public:
                        ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg);
                        virtual ~ParaWin();
        virtual void    dispose() SAL_OVERRIDE;

        void            SetFunctionDesc(const IFunctionDescription* pFDesc);
        void            SetArgumentOffset(sal_uInt16 nOffset);

include/formula/funcutl.hxx

diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index bc40705..17713a7 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -48,6 +48,7 @@ public:
    RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER );

    virtual ~RefEdit();
    virtual void dispose() SAL_OVERRIDE;

    void SetRefString( const OUString& rStr );