diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-03-06 12:17:07 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-04-17 13:18:40 +0200 |
| commit | 9d876574bf563ab325691fea1f56d2444f934633 (patch) | |
| tree | f23b6f211be684bc59e2923dd45c3da2de349a95 /sfx2 | |
| parent | 5275bcdec5e6ef70102c08e3e04f8715abc73e8d (diff) | |
tdf#115806: Remember last active deck also on context switch
within 1 application
Change-Id: Icab6dea9f9a7895732c41e6d96b9d4546cf0001f
Reviewed-on: https://gerrit.libreoffice.org/51530
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit 10e4528e8cb9818e7b8fcef8b1e96985f8b28640)
Reviewed-on: https://gerrit.libreoffice.org/52011
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit afaa944633cb94205fb835c1d93775fa51ead749)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/ResourceManager.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index ead0ce7d7f11..9267f296b17d 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -254,6 +254,11 @@ const OUString& ResourceManager::GetLastActiveDeck( const Context& rContext ) return maLastActiveDecks[rContext.msApplication]; } +void ResourceManager::SetLastActiveDeck( const Context& rContext, const OUString &rsDeckId ) +{ + maLastActiveDecks[rContext.msApplication] = rsDeckId; +} + void ResourceManager::ReadDeckList() { const utl::OConfigurationTreeRoot aDeckRootNode( diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 5752120038a4..78efa83ed087 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -437,8 +437,12 @@ void SidebarController::UpdateConfigurations() || mnRequestedForceFlags!=SwitchFlag_NoForce) { - if (maCurrentContext.msApplication != "none") + if ((maCurrentContext.msApplication != "none") && + !maCurrentContext.msApplication.isEmpty()) + { mpResourceManager->SaveDecksSettings(maCurrentContext); + mpResourceManager->SetLastActiveDeck(maCurrentContext, msCurrentDeckId); + } // get last active deck for this application on first update if (!maRequestedContext.msApplication.isEmpty() && |