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 /cui/source | |
| 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 'cui/source')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/inc/cuihyperdlg.hxx | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 5e792a5e59c0..e166c7475381 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -283,7 +283,7 @@ void SvxHpLinkDlg::Start() | \**********************************************************************/ -IconChoicePageData* SvxHpLinkDlg::GetPageData ( const OString& rId ) +IconChoicePageData* SvxHpLinkDlg::GetPageData ( std::string_view rId ) { IconChoicePageData *pRet = nullptr; for (const auto & pData : maPageList) diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 626ac501cd63..d5842369f45a 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> #include <memory> +#include <string_view> #include <svx/hlnkitem.hxx> #include <sfx2/childwin.hxx> @@ -88,7 +89,7 @@ private: DECL_LINK( ChosePageHdl_Impl, const OString&, void ); - IconChoicePageData* GetPageData ( const OString& rId ); + IconChoicePageData* GetPageData ( std::string_view rId ); void SwitchPage( const OString& rId ); @@ -96,7 +97,7 @@ private: DECL_LINK (ClickOkHdl_Impl, weld::Button&, void ); DECL_LINK (ClickApplyHdl_Impl, weld::Button&, void ); - IconChoicePage* GetTabPage( const OString& rPageId ) + IconChoicePage* GetTabPage( std::string_view rPageId ) { return GetPageData(rPageId)->xPage.get(); } void ActivatePageImpl (); |