svn commit: r1480250 - /openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx

[af]

Author: af
Date: Wed May  8 12:35:53 2013
New Revision: 1480250

URL: http://svn.apache.org/r1480250
Log:
122082: Show correct deck title and tab bar highlight after switching sidebar 
decks.

Modified:
    openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx

Modified: openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx?rev=1480250&r1=1480249&r2=1480250&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx (original)
+++ openoffice/trunk/main/sfx2/source/sidebar/SidebarController.cxx Wed May  8 
12:35:53 2013
@@ -390,7 +390,6 @@ void SidebarController::UpdateConfigurat
             maCurrentContext,
             mbIsDocumentReadOnly,
             mxFrame);
-        mpTabBar->SetDecks(aDecks);
 
         // Notify the tab bar about the updated set of decks.
         mpTabBar->SetDecks(aDecks);
@@ -422,13 +421,12 @@ void SidebarController::UpdateConfigurat
             // 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);