commit 00ebfa7b1f3086e729b7a088d690cb5eda2a820e
author Michael Meeks <michael.meeks@collabora.com> Fri Mar 13 22:20:21 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 11:02:29 2015 +0100
tree 61874cd1355c1e95a7706ee0846992a19d666359
parent 6443d75965a34b0b11f176d887015997b4eadc5f

convert a problematic array to VclPtr.

Change-Id: Ia8b6984a8a9bdf6f32cf5ebfc971a6921796eece

sfx2/source/appl/workwin.cxx

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 1591113..2298469 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -606,7 +606,6 @@ SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxBindings& rB, SfxWorkWindow*
    m_aTbxTypeName( "private:resource/toolbar/" ),
    m_aProgressBarResName( "private:resource/progressbar/progressbar" )
{
    memset(pSplit, 0, sizeof(pSplit));
    DBG_ASSERT (pBindings, "No Bindings!");

    pBindings->SetWorkWindow_Impl( this );
@@ -633,10 +632,10 @@ SfxWorkWindow::~SfxWorkWindow()
    // Delete SplitWindows
    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
    {
        SfxSplitWindow *p = pSplit[n];
        VclPtr<SfxSplitWindow> p = pSplit[n];
        if (p->GetWindowCount())
            ReleaseChild_Impl(*p);
        delete p;
        pSplit[n].disposeAndClear();
    }

    // Delete help structure for Child-Windows
@@ -677,8 +676,8 @@ void SfxWorkWindow::DeleteControllers_Impl()
    for ( n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
    {
        SfxSplitWindow *p = pSplit[n];
           if (p->GetWindowCount())
        p->Lock();
        if (p->GetWindowCount())
            p->Lock();
    }

    // Delete Child-Windows
@@ -2534,7 +2533,7 @@ bool SfxWorkWindow::IsAutoHideMode( const SfxSplitWindow *pSplitWin )
{
    for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ )
    {
        if ( pSplit[n] != pSplitWin && pSplit[n]->IsAutoHide( true ) )
        if ( pSplit[n].get() != pSplitWin && pSplit[n]->IsAutoHide( true ) )
            return true;
    }
    return false;

sfx2/source/inc/workwin.hxx

diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 911fd85..74ae7fb 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -222,7 +222,7 @@ protected:
    Rectangle               aClientArea;
    Rectangle               aUpperClientArea;
    SfxWorkWindow*          pParent;
    SfxSplitWindow*         pSplit[SFX_SPLITWINDOWS_MAX];
    VclPtr<SfxSplitWindow>  pSplit[SFX_SPLITWINDOWS_MAX];
    SfxChildList_Impl       aChildren;
    SfxChildWindows_Impl    aChildWins;
    SfxBindings*            pBindings;