diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-20 09:47:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-20 13:07:02 +0100 |
| commit | cf7306194f5c677fef75e3ff5098676ee302359e (patch) | |
| tree | a52a0980de72c7f70e4f3ae55126579655440773 /vcl/source/control/ivctrl.cxx | |
| parent | 24b02a4f2507f40fe9d36c393c59e12c072428c3 (diff) | |
No longer need to worry about ambiguous operator== in loplugin:stringviewparam
...after 46c5de832868d2812448b2caace3eeaa9237b9f6 "make *String(string_view)
constructors explicit"
Change-Id: I6e884c762a2fc91f5dd6fbb197a596fd60f17cae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108043
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/source/control/ivctrl.cxx')
| -rw-r--r-- | vcl/source/control/ivctrl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/control/ivctrl.cxx b/vcl/source/control/ivctrl.cxx index 87b746c88da0..f59e6784c7da 100644 --- a/vcl/source/control/ivctrl.cxx +++ b/vcl/source/control/ivctrl.cxx @@ -505,7 +505,7 @@ VerticalTabPageData* VerticalTabControl::GetPageData(const SvxIconChoiceCtrlEntr return pRet; } -VerticalTabPageData* VerticalTabControl::GetPageData(const OString& rId) const +VerticalTabPageData* VerticalTabControl::GetPageData(std::string_view rId) const { VerticalTabPageData* pRet = nullptr; for (auto & pData : maPageList) @@ -579,7 +579,7 @@ void VerticalTabControl::InsertPage(const rtl::OString &rIdent, const rtl::OUStr pNew->xPage->Hide(); } -void VerticalTabControl::RemovePage(const rtl::OString &rPageId) +void VerticalTabControl::RemovePage(std::string_view rPageId) { for (auto it = maPageList.begin(), end = maPageList.end(); it != end; ++it) { @@ -595,7 +595,7 @@ void VerticalTabControl::RemovePage(const rtl::OString &rPageId) } } -sal_uInt16 VerticalTabControl::GetPagePos(const OString& rPageId) const +sal_uInt16 VerticalTabControl::GetPagePos(std::string_view rPageId) const { VerticalTabPageData* pData = GetPageData(rPageId); if (!pData) @@ -603,7 +603,7 @@ sal_uInt16 VerticalTabControl::GetPagePos(const OString& rPageId) const return m_xChooser->GetEntryListPos(pData->pEntry); } -VclPtr<vcl::Window> VerticalTabControl::GetPage(const OString& rPageId) +VclPtr<vcl::Window> VerticalTabControl::GetPage(std::string_view rPageId) { VerticalTabPageData* pData = GetPageData(rPageId); if (!pData) @@ -611,7 +611,7 @@ VclPtr<vcl::Window> VerticalTabControl::GetPage(const OString& rPageId) return pData->xPage; } -OUString VerticalTabControl::GetPageText(const OString& rPageId) const +OUString VerticalTabControl::GetPageText(std::string_view rPageId) const { VerticalTabPageData* pData = GetPageData(rPageId); if (!pData) @@ -619,7 +619,7 @@ OUString VerticalTabControl::GetPageText(const OString& rPageId) const return pData->pEntry->GetText(); } -void VerticalTabControl::SetPageText(const OString& rPageId, const OUString& rText) +void VerticalTabControl::SetPageText(std::string_view rPageId, const OUString& rText) { VerticalTabPageData* pData = GetPageData(rPageId); if (!pData) |