From 35e471bb4d1388cf5afcdcee214cf5111edf44e3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 11 Dec 2020 17:44:34 +0100 Subject: 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 --- registry/source/regimpl.cxx | 2 +- registry/source/regimpl.hxx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'registry/source') diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index 27a4592c9dc2..dc87985ab623 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -1005,7 +1005,7 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey, } RegError ORegistry::checkBlop(OStoreStream& rValue, - const OUString& sTargetPath, + std::u16string_view sTargetPath, sal_uInt32 srcValueSize, sal_uInt8 const * pSrcBuffer, bool bReport) diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx index e049cf147c18..db2af7e77846 100644 --- a/registry/source/regimpl.hxx +++ b/registry/source/regimpl.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_REGISTRY_SOURCE_REGIMPL_HXX #define INCLUDED_REGISTRY_SOURCE_REGIMPL_HXX +#include + +#include #include #include @@ -111,7 +114,7 @@ private: bool bReport); static RegError checkBlop(store::OStoreStream& rValue, - const OUString& sTargetPath, + std::u16string_view sTargetPath, sal_uInt32 srcValueSize, sal_uInt8 const * pSrcBuffer, bool bReport); -- cgit ora/cp-4.2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2024-05-08loplugin:ostr in frameworkNoel Grandin
2021-12-26use comphelper::WeakComponentImplHelper in UICommandDescriptionNoel Grandin
2020-09-18lok: make labels and tooltips translated for commandsSzymon Kłos
2020-04-26tdf#124176: Use pragma once instead of include guardsAndrea Gelmini
2019-12-19sal_Char->char in forms..frameworkNoel Grandin
2019-11-11tdf#42949 Fix IWYU warnings in framework/*/*hxxGabor Kelemen
2019-07-31Improved loplugin:stringconstant (now that GCC 7 supports it): frameworkStephan Bergmann
2017-10-23overload std::hash for OUString and OStringNoel Grandin
2017-01-26Remove dynamic exception specificationsStephan Bergmann
2016-09-13loplugin:override: No more need for the "MSVC dtor override" workaroundStephan Bergmann
2016-04-04tdf#97499 Fixed containers parameters clearing #3tymyjan
2015-11-20new loplugin:unusedfieldsNoel Grandin
2015-11-15use initialiser syntax for Sequence<OUString>Noel Grandin
2015-10-14com::sun::star->css in frameworkNoel Grandin
2015-10-12Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY codeStephan Bergmann
2015-08-14framework: tdf#88206 replace cppu::WeakImplHelper* etc.Takeshi Abe
2015-07-30loplugin:unusedmethodsNoel Grandin
2015-01-02boost::unordered_map->std::unordered_mapCaolán McNamara
2014-12-18framework: Use appropriate OUString functions on string constantsStephan Bergmann
2014-04-07framework: sal_Bool->boolNoel Grandin
2014-03-26First batch of adding SAL_OVERRRIDE to overriding function declarationsStephan Bergmann
2014-03-18Use cppu::BaseMutex instead of plain osl::Mutex as baseStephan Bergmann
2014-02-26cppuhelper: retrofit std::exception into overriding exception specsStephan Bergmann
2014-01-28fwk: Constructor feature for one instance UICommandDescription.Matúš Kukan
2013-11-05fixincludeguards.sh: frameworkThomas Arnhold
2013-09-26Otherwhise -> OtherwiseJesús Corrius