SidebarController.cxx (7e429a12) SidebarController.cxx (609f33b4)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 376 unchanged lines hidden (view full) ---

385
386 // Find the set of decks that could be displayed for the new context.
387 ResourceManager::DeckContextDescriptorContainer aDecks;
388 ResourceManager::Instance().GetMatchingDecks (
389 aDecks,
390 maCurrentContext,
391 mbIsDocumentReadOnly,
392 mxFrame);
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 376 unchanged lines hidden (view full) ---

385
386 // Find the set of decks that could be displayed for the new context.
387 ResourceManager::DeckContextDescriptorContainer aDecks;
388 ResourceManager::Instance().GetMatchingDecks (
389 aDecks,
390 maCurrentContext,
391 mbIsDocumentReadOnly,
392 mxFrame);
393 mpTabBar->SetDecks(aDecks);
394
395 // Notify the tab bar about the updated set of decks.
396 mpTabBar->SetDecks(aDecks);
397
398 // Find the new deck. By default that is the same as the old
399 // one. If that is not set or not enabled, then choose the
400 // first enabled deck.
401 OUString sNewDeckId;

--- 15 unchanged lines hidden (view full) ---

417 }
418 }
419
420 if (sNewDeckId.getLength() == 0)
421 {
422 // We did not find a valid deck.
423 RequestCloseDeck();
424 return;
393
394 // Notify the tab bar about the updated set of decks.
395 mpTabBar->SetDecks(aDecks);
396
397 // Find the new deck. By default that is the same as the old
398 // one. If that is not set or not enabled, then choose the
399 // first enabled deck.
400 OUString sNewDeckId;

--- 15 unchanged lines hidden (view full) ---

416 }
417 }
418
419 if (sNewDeckId.getLength() == 0)
420 {
421 // We did not find a valid deck.
422 RequestCloseDeck();
423 return;
425
426 // Tell the tab bar to highlight the button associated
427 // with the deck.
428 mpTabBar->HighlightDeck(sNewDeckId);
429 }
430
424 }
425
431 msCurrentDeckId = sNewDeckId;
426 // Tell the tab bar to highlight the button associated
427 // with the deck.
428 mpTabBar->HighlightDeck(sNewDeckId);
429
432 SwitchToDeck(
433 *ResourceManager::Instance().GetDeckDescriptor(sNewDeckId),
434 maCurrentContext);
435
436#ifdef DEBUG
437 // Show the context name in the deck title bar.
438 if (mpCurrentDeck)
439 {

--- 750 unchanged lines hidden --- 		430 SwitchToDeck(
431 *ResourceManager::Instance().GetDeckDescriptor(sNewDeckId),
432 maCurrentContext);
433
434#ifdef DEBUG
435 // Show the context name in the deck title bar.
436 if (mpCurrentDeck)
437 {

--- 750 unchanged lines hidden ---