diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 17:44:34 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-11 21:25:10 +0100 |
commit | 35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch) | |
tree | bb78f4f13f131f0cb206a9707cc3cfc495a3876a /forms | |
parent | 0c06e77c122f10a1842bc908bd6e25b1110ddbd2 (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 'forms')
4 files changed, 14 insertions, 5 deletions
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index d46cd0b0d3f3..97c76efb5eff 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <string_view> #include <componenttools.hxx> #include "DatabaseForm.hxx" @@ -916,7 +919,7 @@ void ODatabaseForm::Encode( OUString& rString ) void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const OUString& rName, - const OUString& rData ) + std::u16string_view rData ) { // Create part as MessageChild std::unique_ptr<INetMIMEMessage> pChild(new INetMIMEMessage); @@ -2075,7 +2078,7 @@ void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control, } static void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransformer>& xTransformer,const OUString& aURLStr,const OUString& aReferer,const OUString& aTargetName - ,const OUString& aData,rtl_TextEncoding _eEncoding) + ,std::u16string_view aData,rtl_TextEncoding _eEncoding) { URL aURL; aURL.Complete = aURLStr; diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index b64352e5e1f3..c89a197ba4e9 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -21,6 +21,7 @@ #include <sal/config.h> +#include <string_view> #include <vector> #include <propertybaghelper.hxx> @@ -505,7 +506,7 @@ private: void FillSuccessfulList(HtmlSuccessfulObjList& rList, const css::uno::Reference< css::awt::XControl>& rxSubmitButton, const css::awt::MouseEvent& MouseEvt); - static void InsertTextPart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rData); + static void InsertTextPart(INetMIMEMessage& rParent, const OUString& rName, std::u16string_view rData); static void InsertFilePart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rFileName); static void Encode(OUString& rString); diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx index ab27bf5908ae..22a625ccb4a0 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.cxx +++ b/forms/source/xforms/submission/serialization_urlencoded.cxx @@ -69,7 +69,8 @@ bool CSerializationURLEncoded::is_unreserved(char c) } return false; } -void CSerializationURLEncoded::encode_and_append(const OUString& aString, OStringBuffer& aBuffer) +void CSerializationURLEncoded::encode_and_append( + std::u16string_view aString, OStringBuffer& aBuffer) { OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8); const sal_uInt8 *pString = reinterpret_cast< const sal_uInt8 * >( utf8String.getStr() ); diff --git a/forms/source/xforms/submission/serialization_urlencoded.hxx b/forms/source/xforms/submission/serialization_urlencoded.hxx index afd9d5488568..334066f93ba5 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.hxx +++ b/forms/source/xforms/submission/serialization_urlencoded.hxx @@ -20,6 +20,10 @@ #ifndef INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_URLENCODED_HXX #define INCLUDED_FORMS_SOURCE_XFORMS_SUBMISSION_SERIALIZATION_URLENCODED_HXX +#include <sal/config.h> + +#include <string_view> + #include <com/sun/star/io/XPipe.hpp> #include <rtl/strbuf.hxx> @@ -32,7 +36,7 @@ private: css::uno::Reference<css::io::XPipe> m_aPipe; static bool is_unreserved(char); - static void encode_and_append(const OUString& aString, OStringBuffer& aBuffer); + static void encode_and_append(std::u16string_view aString, OStringBuffer& aBuffer); void serialize_node(const css::uno::Reference<css::xml::dom::XNode>& aNode); public: |