diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-28 17:56:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-29 16:42:33 +0100 |
| commit | 042033f1e6da22616cb76c8d950c20c9efecbad5 (patch) | |
| tree | 26b3f1f42d067506f44550b410f3fb9640616a5b /desktop/inc | |
| parent | ccfd8e9d09f9ac0a0ea92d0f378391006faaf934 (diff) | |
loplugin:stringviewparam: operator +
Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 3 | ||||
| -rw-r--r-- | desktop/inc/lib/init.hxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 26e4691ab53c..e2ecf5920aa0 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -29,6 +29,7 @@ #include <com/sun/star/uno/Reference.h> #include <memory> +#include <string_view> #include <thread> namespace com::sun::star::uno { class XComponentContext; } @@ -135,7 +136,7 @@ class Desktop final : public Application static void FlushConfiguration(); static bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - static void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg ); + static void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, std::u16string_view aMsg ); // Create an error message depending on bootstrap failure code and an optional file url static OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index 84d9d5299fd4..e47c92cc5c0a 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -13,6 +13,7 @@ #include <unordered_map> #include <memory> #include <mutex> +#include <string_view> #include <boost/property_tree/ptree.hpp> #include <boost/variant.hpp> @@ -177,7 +178,7 @@ namespace desktop { /// Helper function to extract the value from parameters delimited by /// comma, like: Name1=Value1,Name2=Value2,Name3=Value3. /// @param rOptions When extracted, the Param=Value is removed from it. - DESKTOP_DLLPUBLIC OUString extractParameter(OUString& aOptions, const OUString& rName); + DESKTOP_DLLPUBLIC OUString extractParameter(OUString& aOptions, std::u16string_view rName); /// Helper function to convert JSON to a vector of PropertyValues. /// Public to be unit-test-able. |