sfx2/source/sidebar/SidebarController.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
New commits: commit a080ba5ed71607b8b2540f6c1ab855c825ade662 Author: Andre Fischer <a...@apache.org> Date: Wed May 8 12:35:53 2013 +0000 Resolves: #i122082# Show correct deck title and tab bar highlight... after switching sidebar decks (cherry picked from commit f44ca372a2a88f996366e5cb44842ef79dd9df6e) Change-Id: I2162b2eafb8bd1fc8c803a398b475cdf71b6c34d 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); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits