commit 7aa921cb53eedd0a107fbe9f75365adcce4d37d9
author Michael Meeks <michael.meeks@collabora.com> Tue Mar 17 20:36:34 2015 +0000
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 11:51:24 2015 +0100
tree ea9e4d6510ae63fc05c71d948e61e55bacf5863f
parent 256371f49dad16347db48d7ff826779345538f3c

lingering smart_ptr 'reset' -> disposeAndClear.

Change-Id: Ia126588580b76cc69944bb974d93cb51ee0356dd

sfx2/source/sidebar/Deck.cxx

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index b1e2917..83603a7 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -89,11 +89,6 @@ void Deck::dispose()
        maPanels[i]->dispose();

    maPanels.clear();
    mpTitleBar.disposeAndClear();
    mpScrollClipWindow.disposeAndClear();
    mpScrollContainer.disposeAndClear();
    mpFiller.disposeAndClear();
    mpVerticalScrollBar.disposeAndClear();
    vcl::Window::dispose();
}

@@ -114,11 +109,11 @@ void Deck::Dispose (void)
        }
    }

    mpTitleBar.reset();
    mpFiller.reset();
    mpVerticalScrollBar.reset();
    mpScrollContainer.reset();
    mpScrollClipWindow.reset();
    mpTitleBar.disposeAndClear();
    mpFiller.disposeAndClear();
    mpVerticalScrollBar.disposeAndClear();
    mpScrollContainer.disposeAndClear();
    mpScrollClipWindow.disposeAndClear();
}

DeckTitleBar* Deck::GetTitleBar (void) const

sfx2/source/sidebar/Panel.cxx

diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 086999e..2f33b95 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -77,7 +77,6 @@ Panel::~Panel()
void Panel::dispose()
{
    Dispose();
    mpTitleBar.disposeAndClear();
    vcl::Window::dispose();
}

@@ -98,7 +97,7 @@ void Panel::Dispose (void)
            xComponent->dispose();
    }

    mpTitleBar.reset();
    mpTitleBar.disposeAndClear();
}

PanelTitleBar* Panel::GetTitleBar (void) const

sfx2/source/sidebar/SidebarController.cxx

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index ab01e7d..dd66551 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -117,8 +117,7 @@ SidebarController::SidebarController (
      mxReadOnlyModeDispatch(),
      mbIsDocumentReadOnly(false),
      mpSplitWindow(NULL),
      mnWidthOnSplitterButtonDown(0),
      mpCloseIndicator()
      mnWidthOnSplitterButtonDown(0)
{
    // Listen for context change events.
    css::uno::Reference<css::ui::XContextChangeEventMultiplexer> xMultiplexer (
@@ -173,6 +172,8 @@ SidebarController* SidebarController::GetSidebarControllerForFrame (

void SAL_CALL SidebarController::disposing (void)
{
    mpCloseIndicator.disposeAndClear();

    SidebarControllerContainer::iterator iEntry (maSidebarControllerContainer.find(mxFrame));
    if (iEntry != maSidebarControllerContainer.end())
        maSidebarControllerContainer.erase(iEntry);
@@ -204,10 +205,10 @@ void SAL_CALL SidebarController::disposing (void)
    {
        mpCurrentDeck->Dispose();
        mpCurrentDeck->PrintWindowTree();
        mpCurrentDeck.reset();
        mpCurrentDeck.disposeAndClear();
    }

    mpTabBar.reset();
    mpTabBar.disposeAndClear();

    Theme::GetPropertySet()->removePropertyChangeListener(
        OUString(""),
@@ -537,7 +538,7 @@ void SidebarController::SwitchToDeck (
        if (mpCurrentDeck)
        {
            mpCurrentDeck->Dispose();
            mpCurrentDeck.reset();
            mpCurrentDeck.disposeAndClear();
        }

        msCurrentDeckId = rDeckDescriptor.msId;

sfx2/source/sidebar/TabBar.cxx

diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 795b916..b055ec3 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -70,7 +70,6 @@ TabBar::~TabBar()
void TabBar::dispose()
{
    maItems.clear();
    mpMenuButton.reset();
    mpMenuButton.disposeAndClear();
    vcl::Window::dispose();
}
@@ -103,7 +102,7 @@ void TabBar::SetDecks (
            iItem!=iEnd;
            ++iItem)
        {
            iItem->mpButton.reset();
            iItem->mpButton.disposeAndClear();
        }
        maItems.clear();
    }
@@ -124,7 +123,8 @@ void TabBar::SetDecks (

        Item& rItem (maItems[nIndex++]);
        rItem.msDeckId = pDescriptor->msId;
        rItem.mpButton.reset(CreateTabItem(*pDescriptor));
        rItem.mpButton.disposeAndClear();
        rItem.mpButton = CreateTabItem(*pDescriptor);
        rItem.mpButton->SetClickHdl(LINK(&rItem, TabBar::Item, HandleClick));
        rItem.maDeckActivationFunctor = maDeckActivationFunctor;
        rItem.mbIsHiddenByDefault = false;