diff options
| author | Noel <noelgrandin@gmail.com> | 2020-11-18 10:10:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-24 09:45:04 +0100 |
| commit | bb06f51308428500c9c8d11ae05f0aa03ecc179c (patch) | |
| tree | b18620e8572ed6d4c43c8605660d59f5f7a7e531 /framework/inc | |
| parent | 42e8e16cf93dcf944e5c1106f76aaa32057c0397 (diff) | |
loplugin:stringviewparam extend to comparison operators
which means that some call sites have to change to use
unicode string literals i.e. u"foo" instead of "foo"
Change-Id: Ie51c3adf56d343dd1d1710777f9d2a43ee66221c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106125
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/jobs/helponstartup.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/targets.h | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/menubarmerger.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/statusbarmerger.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/uielement/toolbarmerger.hxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index 4c070627dbae..d22e8b98071f 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -137,7 +137,7 @@ class HelpOnStartup final : public ::cppu::WeakImplHelper< css::lang::XServiceIn sal_True if the given URL is any default one ... sal_False otherwise. */ - bool its_isHelpUrlADefaultOne(const OUString& sHelpURL); + bool its_isHelpUrlADefaultOne(std::u16string_view sHelpURL); /** @short checks, if the help module should be shown automatically for the currently opened office module. diff --git a/framework/inc/targets.h b/framework/inc/targets.h index a15db1e84851..b0bf251f0e8d 100644 --- a/framework/inc/targets.h +++ b/framework/inc/targets.h @@ -29,7 +29,7 @@ namespace framework{ #define SPECIALTARGET_TOP "_top" // Search at our parents for the first task (if any exist) or a frame without a parent. #define SPECIALTARGET_BLANK "_blank" // Create a new task. #define SPECIALTARGET_DEFAULT "_default" // Create a new task or recycle an existing one -#define SPECIALTARGET_BEAMER "_beamer" // special frame in hierarchy +#define SPECIALTARGET_BEAMER u"_beamer" // special frame in hierarchy #define SPECIALTARGET_HELPTASK "OFFICE_HELP_TASK" // special name for our help task } // namespace framework diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index 8646563b86d8..910bc58f2014 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -66,7 +66,7 @@ namespace MenuBarMerger void RetrieveReferencePath( const OUString&, std::vector< OUString >& aReferencePath ); ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu ); - sal_uInt16 FindMenuItem( const OUString& rCmd, + sal_uInt16 FindMenuItem( std::u16string_view rCmd, Menu const * pMenu ); void GetMenuEntry( const css::uno::Sequence< css::beans::PropertyValue >& rAddonMenuEntry, AddonMenuItem& aAddonMenu ); diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx index 497862fae127..964559de777e 100644 --- a/framework/inc/uielement/statusbarmerger.hxx +++ b/framework/inc/uielement/statusbarmerger.hxx @@ -55,7 +55,7 @@ namespace StatusbarMerger AddonStatusbarItemContainer& rContainer ); sal_uInt16 FindReferencePos( StatusBar* pStatusbar, - const OUString& rReferencePoint ); + std::u16string_view rReferencePoint ); bool ProcessMergeOperation( StatusBar* pStatusbar, sal_uInt16 nPos, diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index 03b9a1d8325e..482b730aa749 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -73,7 +73,7 @@ class ToolBarMerger sal_uInt16& rWidth ); static ReferenceToolbarPathInfo FindReferencePoint( const ToolBox* pToolbar, - const OUString& rReferencePoint ); + std::u16string_view rReferencePoint ); static bool ProcessMergeOperation( ToolBox* pToolbar, ToolBox::ImplToolItems::size_type nPos, |