diff options
Diffstat (limited to 'sfx2/source/sidebar/SidebarController.cxx')
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index f359e768665e..5367292a8615 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -114,7 +114,7 @@ namespace { /** When in doubt, show this deck. */ - const char gsDefaultDeckId[] = "PropertyDeck"; + constexpr OUStringLiteral gsDefaultDeckId(u"PropertyDeck"); } SidebarController::SidebarController ( @@ -639,7 +639,7 @@ void SidebarController::OpenThenToggleDeck ( } void SidebarController::OpenThenSwitchToDeck ( - const OUString& rsDeckId) + std::u16string_view rsDeckId) { RequestOpenDeck(); SwitchToDeck(rsDeckId); @@ -652,7 +652,7 @@ void SidebarController::SwitchToDefaultDeck() } void SidebarController::SwitchToDeck ( - const OUString& rsDeckId) + std::u16string_view rsDeckId) { if ( msCurrentDeckId != rsDeckId || ! mbIsDeckOpen @@ -665,11 +665,11 @@ void SidebarController::SwitchToDeck ( } } -void SidebarController::CreateDeck(const OUString& rDeckId) { +void SidebarController::CreateDeck(std::u16string_view rDeckId) { CreateDeck(rDeckId, maCurrentContext); } -void SidebarController::CreateDeck(const OUString& rDeckId, const Context& rContext, bool bForceCreate) +void SidebarController::CreateDeck(std::u16string_view rDeckId, const Context& rContext, bool bForceCreate) { std::shared_ptr<DeckDescriptor> xDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId); @@ -691,7 +691,7 @@ void SidebarController::CreateDeck(const OUString& rDeckId, const Context& rCont CreatePanels(rDeckId, rContext); } -void SidebarController::CreatePanels(const OUString& rDeckId, const Context& rContext) +void SidebarController::CreatePanels(std::u16string_view rDeckId, const Context& rContext) { std::shared_ptr<DeckDescriptor> xDeckDescriptor = mpResourceManager->GetDeckDescriptor(rDeckId); @@ -892,7 +892,7 @@ void SidebarController::SwitchToDeck ( UpdateTitleBarIcons(); } -void SidebarController::notifyDeckTitle(const OUString& targetDeckId) +void SidebarController::notifyDeckTitle(std::u16string_view targetDeckId) { if (msCurrentDeckId == targetDeckId) { @@ -903,7 +903,7 @@ void SidebarController::notifyDeckTitle(const OUString& targetDeckId) } VclPtr<Panel> SidebarController::CreatePanel ( - const OUString& rsPanelId, + std::u16string_view rsPanelId, vcl::Window* pParentWindow, const bool bIsInitiallyExpanded, const Context& rContext, @@ -1247,7 +1247,7 @@ bool SidebarController::IsDeckOpen(const sal_Int32 nIndex) return mbIsDeckOpen && *mbIsDeckOpen; } -bool SidebarController::IsDeckVisible(const OUString& rsDeckId) +bool SidebarController::IsDeckVisible(std::u16string_view rsDeckId) { return mbIsDeckOpen && *mbIsDeckOpen && msCurrentDeckId == rsDeckId; } @@ -1523,7 +1523,7 @@ ResourceManager::DeckContextDescriptorContainer SidebarController::GetMatchingDe return aDecks; } -ResourceManager::PanelContextDescriptorContainer SidebarController::GetMatchingPanels(const OUString& rDeckId) +ResourceManager::PanelContextDescriptorContainer SidebarController::GetMatchingPanels(std::u16string_view rDeckId) { ResourceManager::PanelContextDescriptorContainer aPanels; |