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 /sw/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 'sw/source')
| -rw-r--r-- | sw/source/ui/fldui/fldtdlg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/fldtdlg.hxx | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index fefd2eb8cd3a..cf07d2a25b9f 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -194,7 +194,7 @@ void SwFieldDlg::ReInitDlg() } // newly initialise TabPage after Doc-Switch -void SwFieldDlg::ReInitTabPage(const OString& rPageId, bool bOnlyActivate) +void SwFieldDlg::ReInitTabPage(std::string_view rPageId, bool bOnlyActivate) { SwFieldPage* pPage = static_cast<SwFieldPage*>(GetTabPage(rPageId)); if (pPage) diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx index 159881ed1192..8f690bb25f9e 100644 --- a/sw/source/uibase/inc/fldtdlg.hxx +++ b/sw/source/uibase/inc/fldtdlg.hxx @@ -18,6 +18,11 @@ */ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDTDLG_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_FLDTDLG_HXX + +#include <sal/config.h> + +#include <string_view> + #include <sfx2/tabdlg.hxx> class SfxBindings; @@ -36,7 +41,7 @@ class SwFieldDlg : public SfxTabDialogController virtual SfxItemSet* CreateInputItemSet(const OString& rId) override; virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override; - void ReInitTabPage(const OString& rPageId, + void ReInitTabPage(std::string_view rPageId, bool bOnlyActivate = false); public: |