summaryrefslogtreecommitdiff
path: root/framework/inc
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-11-25 08:14:07 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-11-30 12:32:14 +0100
commit8332d6d8200e8ca1f22dd98d9373efd5a431d09c (patch)
treedd45d452202998297b8562743ea6345462304d04 /framework/inc
parentd05a4cfbdcece491f7385dbeaa7eca03f2fdc1d5 (diff)
loplugin:stringviewparam include comparisons with string literals
Change-Id: I8ba1214500dddaf413c506a4b82f43d63cda804b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106559 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework/inc')
-rw-r--r--framework/inc/targets.h12
-rw-r--r--framework/inc/uielement/statusbarmerger.hxx2
-rw-r--r--framework/inc/xml/acceleratorconfigurationreader.hxx4
3 files changed, 9 insertions, 9 deletions
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index b0bf251f0e8d..061b532fb6f2 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -24,13 +24,13 @@ namespace framework{
// Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL()
-#define SPECIALTARGET_SELF "_self" // The frame himself is searched.
-#define SPECIALTARGET_PARENT "_parent" // The direct parent frame is searched.
-#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_SELF u"_self" // The frame himself is searched.
+#define SPECIALTARGET_PARENT u"_parent" // The direct parent frame is searched.
+#define SPECIALTARGET_TOP u"_top" // Search at our parents for the first task (if any exist) or a frame without a parent.
+#define SPECIALTARGET_BLANK u"_blank" // Create a new task.
+#define SPECIALTARGET_DEFAULT u"_default" // Create a new task or recycle an existing one
#define SPECIALTARGET_BEAMER u"_beamer" // special frame in hierarchy
-#define SPECIALTARGET_HELPTASK "OFFICE_HELP_TASK" // special name for our help task
+#define SPECIALTARGET_HELPTASK u"OFFICE_HELP_TASK" // special name for our help task
} // namespace framework
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx
index 964559de777e..d7fecfaa881e 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.hxx
@@ -67,7 +67,7 @@ namespace StatusbarMerger
bool ProcessMergeFallback( StatusBar* pStatusbar,
sal_uInt16& rItemId,
const OUString& rMergeCommand,
- const OUString& rMergeFallback,
+ std::u16string_view rMergeFallback,
const AddonStatusbarItemContainer& rItems );
}
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index 76a0a159ca69..b86bb1095e83 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -120,10 +120,10 @@ class AcceleratorConfigurationReader final : public ::cppu::WeakImplHelper< css:
private:
/** TODO document me */
- static EXMLElement implst_classifyElement(const OUString& sElement);
+ static EXMLElement implst_classifyElement(std::u16string_view sElement);
/** TODO document me */
- static EXMLAttribute implst_classifyAttribute(const OUString& sAttribute);
+ static EXMLAttribute implst_classifyAttribute(std::u16string_view sAttribute);
/** TODO document me */
OUString implts_getErrorLineString();