summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-11 17:44:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-11 21:25:10 +0100
commit35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch)
treebb78f4f13f131f0cb206a9707cc3cfc495a3876a /framework
parent0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (diff)
Adapt the remaining OUString functions to std string_view
...for LIBO_INTERNAL_ONLY. These had been missed by 1b43cceaea2084a0489db68cd0113508f34b6643 "Make many OUString functions take std::u16string_view parameters" because they did not match the multi-overload pattern that was addressed there, but they nevertheless benefit from being changed just as well (witness e.g. the various resulting changes from copy() to subView()). This showed a conversion from OStringChar to std::string_view to be missing (while the corresponding conversion form OUStringChar to std::u16string_view was already present). The improvement to loplugin:stringadd became necessary to fix > [CPT] compilerplugins/clang/test/stringadd.cxx > error: 'error' diagnostics expected but not seen: > File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd] > File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd] > 2 errors generated. Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/dispatch/interceptionhelper.hxx3
-rw-r--r--framework/inc/helper/persistentwindowstate.hxx6
-rw-r--r--framework/source/helper/persistentwindowstate.cxx4
-rw-r--r--framework/source/jobs/jobdata.cxx10
4 files changed, 16 insertions, 7 deletions
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 73146ea92bf7..61c4ed8c9ef9 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -32,6 +32,7 @@
#include <cppuhelper/weakref.hxx>
#include <deque>
+#include <string_view>
namespace framework{
@@ -103,7 +104,7 @@ class InterceptionHelper final : public ::cppu::WeakImplHelper<
@return An iterator object, which points directly to the located item inside this list.
In case no interceptor could be found, it points to the end of this list!
*/
- iterator findByPattern(const OUString& sURL)
+ iterator findByPattern(std::u16string_view sURL)
{
iterator pIt;
for (pIt=begin(); pIt!=end(); ++pIt)
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index f467ef9a2286..6b811b9ec3d9 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX
#define INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX
+#include <sal/config.h>
+
+#include <string_view>
+
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
@@ -154,7 +158,7 @@ class PersistentWindowState final : public ::cppu::WeakImplHelper<
contains the information about position and size.
*/
static void implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow ,
- const OUString& sWindowState);
+ std::u16string_view sWindowState);
}; // class PersistentWindowState
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 29ad01c1d0fc..5d4212e1ac2a 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -222,11 +222,11 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::
}
void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow ,
- const OUString& sWindowState)
+ std::u16string_view sWindowState)
{
if (
(!xWindow.is() ) ||
- ( sWindowState.isEmpty() )
+ ( sWindowState.empty() )
)
return;
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 3f7a96674d3d..e04b18227326 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <jobs/configaccess.hxx>
#include <jobs/jobdata.hxx>
#include <classes/converter.hxx>
@@ -415,15 +419,15 @@ void JobData::disableJob()
aConfig.close();
}
-static bool isEnabled( const OUString& sAdminTime ,
- const OUString& sUserTime )
+static bool isEnabled( std::u16string_view sAdminTime ,
+ std::u16string_view sUserTime )
{
/*Attention!
To prevent interpreting of TriGraphs inside next const string value,
we have to encode all '?' signs. Otherwise e.g. "??-" will be translated
to "~" ...
*/
- WildCard aISOPattern("\?\?\?\?-\?\?-\?\?*");
+ WildCard aISOPattern(u"\?\?\?\?-\?\?-\?\?*");
bool bValidAdmin = aISOPattern.Matches(sAdminTime);
bool bValidUser = aISOPattern.Matches(sUserTime );