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 /framework/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 'framework/inc')
-rw-r--r-- | framework/inc/helper/persistentwindowstate.hxx | 4 | ||||
-rw-r--r-- | framework/inc/jobs/helponstartup.hxx | 10 | ||||
-rw-r--r-- | framework/inc/jobs/jobdata.hxx | 3 | ||||
-rw-r--r-- | framework/inc/uifactory/configurationaccessfactorymanager.hxx | 7 | ||||
-rw-r--r-- | framework/inc/uifactory/factoryconfiguration.hxx | 10 |
5 files changed, 21 insertions, 13 deletions
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index 6b811b9ec3d9..86e477fd7920 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -117,7 +117,7 @@ class PersistentWindowState final : public ::cppu::WeakImplHelper< contains the information about position and size. */ static OUString implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext , - const OUString& sModuleName); + std::u16string_view sModuleName); /** @short retrieve the window state from the container window. @@ -144,7 +144,7 @@ class PersistentWindowState final : public ::cppu::WeakImplHelper< contains the information about position and size. */ static void implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const OUString& sModuleName , + std::u16string_view sModuleName , const OUString& sWindowState ); /** @short restore the position and size on the container window. diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx index d22e8b98071f..4f3f5c51b5ed 100644 --- a/framework/inc/jobs/helponstartup.hxx +++ b/framework/inc/jobs/helponstartup.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_JOBS_HELPONSTARTUP_HXX #define INCLUDED_FRAMEWORK_INC_JOBS_HELPONSTARTUP_HXX +#include <sal/config.h> + +#include <string_view> + #include <cppuhelper/implbase.hxx> #include <com/sun/star/task/XJob.hpp> @@ -175,9 +179,9 @@ class HelpOnStartup final : public ::cppu::WeakImplHelper< css::lang::XServiceIn e.g. "vnd.sun.star.help://swriter/?Language=en-US&System=WIN" or "vnd.sun.star.help://swriter/67351?Language=en-US&System=WIN" */ - static OUString ist_createHelpURL(const OUString& sBaseURL, - const OUString& sLocale , - const OUString& sSystem ); + static OUString ist_createHelpURL(std::u16string_view sBaseURL, + std::u16string_view sLocale , + std::u16string_view sSystem ); }; } // namespace framework diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 5d64bcb8ce98..e6cdea7ff13e 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -25,6 +25,7 @@ #include <rtl/ustring.hxx> +#include <string_view> #include <vector> namespace framework{ @@ -190,7 +191,7 @@ class JobData final void disableJob ( ); static std::vector< OUString > getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const OUString& sEvent ); + std::u16string_view sEvent ); static void appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const OUString& sEvent , diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index cf4f151f40dc..7b12048e1223 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -30,6 +30,7 @@ #include <cppuhelper/implbase.hxx> #include <rtl/ustring.hxx> +#include <string_view> #include <unordered_map> namespace framework { @@ -42,9 +43,9 @@ class ConfigurationAccess_FactoryManager final : public ::cppu::WeakImplHelper< void readConfigurationData(); - OUString getFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ) const; - void addFactorySpecifierToTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule, const OUString& aServiceSpecifier ); - void removeFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ); + OUString getFactorySpecifierFromTypeNameModule( std::u16string_view rType, const OUString& rName, std::u16string_view rModule ) const; + void addFactorySpecifierToTypeNameModule( std::u16string_view rType, std::u16string_view rName, std::u16string_view rModule, const OUString& aServiceSpecifier ); + void removeFactorySpecifierFromTypeNameModule( std::u16string_view rType, std::u16string_view rName, std::u16string_view rModule ); css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getFactoriesDescription() const; // container.XContainerListener diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index 9a8112702ec0..1ba2a622c74c 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -26,6 +26,8 @@ #include <cppuhelper/implbase.hxx> #include <rtl/ustring.hxx> + +#include <string_view> #include <unordered_map> // Namespace @@ -45,10 +47,10 @@ public: void readConfigurationData(); void updateConfigurationData(); - OUString getServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const; - OUString getValueFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const; - void addServiceToCommandModule( const OUString& rCommandURL, const OUString& rModule, const OUString& rServiceSpecifier ); - void removeServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ); + OUString getServiceFromCommandModule( std::u16string_view rCommandURL, std::u16string_view rModule ) const; + OUString getValueFromCommandModule( std::u16string_view rCommandURL, std::u16string_view rModule ) const; + void addServiceToCommandModule( std::u16string_view rCommandURL, std::u16string_view rModule, const OUString& rServiceSpecifier ); + void removeServiceFromCommandModule( std::u16string_view rCommandURL, std::u16string_view rModule ); // container.XContainerListener virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override; |