commit bd26a6abb58f16b77f587b8d5c3aee41ae728ada
author Andre Fischer <af@apache.org> Wed May 08 12:35:53 2013 +0000
committer Michael Meeks <michael.meeks@suse.com> Mon May 20 11:33:31 2013 +0100
tree 82ddca9e608a108645fa7a62f016520e4314ba3c
parent 4836645dfddcc7cc18e0b8727ba10bbc41da0f8b

Resolves: #i122082# Show correct deck title and tab bar highlight...

after switching sidebar decks

(cherry picked from commit f44ca372a2a88f996366e5cb44842ef79dd9df6e)

Change-Id: I2162b2eafb8bd1fc8c803a398b475cdf71b6c34d

sfx2/source/sidebar/SidebarController.cxx

diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 3a28941..6656714 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -382,7 +382,6 @@ void SidebarController::UpdateConfigurations (void)
            maCurrentContext,
            mbIsDocumentReadOnly,
            mxFrame);
        mpTabBar->SetDecks(aDecks);

        // Notify the tab bar about the updated set of decks.
        mpTabBar->SetDecks(aDecks);
@@ -414,13 +413,12 @@ void SidebarController::UpdateConfigurations (void)
            // We did not find a valid deck.
            RequestCloseDeck();
            return;

            // Tell the tab bar to highlight the button associated
            // with the deck.
            mpTabBar->HighlightDeck(sNewDeckId);
        }

        msCurrentDeckId = sNewDeckId;
        // Tell the tab bar to highlight the button associated
        // with the deck.
        mpTabBar->HighlightDeck(sNewDeckId);

        SwitchToDeck(
            *ResourceManager::Instance().GetDeckDescriptor(sNewDeckId),
            maCurrentContext);