diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-04-26 07:55:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-04-26 10:41:42 +0200 |
| commit | 4049fe21481fe0bbce52f3fd9f09952d1e112e2d (patch) | |
| tree | 5625eecd27d8af690f21668e617d09efe5c06c76 | |
| parent | 82e789bfc8c215a7b27d4ca8d6567590717168da (diff) | |
Two more uses of rtl::createUriCharClass
...that 6a9f342addf8b1c766163575c7b63e7fcc1f714e "Introduce
rtl::createUriCharClass" had missed
Change-Id: Id37399cb88df25aff22d42e889aea12c1ca90797
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133423
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 26 | ||||
| -rw-r--r-- | stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 21 |
2 files changed, 9 insertions, 38 deletions
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index eaf0444850ce..705262d0a46e 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1307,26 +1307,12 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const OUString string_encode( const OUString & rText ) { - static sal_Bool const uricNoSlash[] = { - false, false, false, false, false, false, false, false, - false, false, false, false, false, false, false, false, - false, false, false, false, false, false, false, false, - false, false, false, false, false, false, false, false, - false, true, false, false, true, false, true, true, // !"#$%&' - true, true, true, true, false, true, true, false, // ()*+,-./ - true, true, true, true, true, true, true, true, // 01234567 - true, true, true, false, false, true, false, true, // 89:;<=>? - true, true, true, true, true, true, true, true, // @ABCDEFG - true, true, true, true, true, true, true, true, // HIJKLMNO - true, true, true, true, true, true, true, true, // PQRSTUVW - true, true, true, false, false, false, false, true, // XYZ[\]^_ - false, true, true, true, true, true, true, true, // `abcdefg - true, true, true, true, true, true, true, true, // hijklmno - true, true, true, true, true, true, true, true, // pqrstuvw - true, true, true, false, false, false, true, false}; // xyz{|}~ - - - return Uri::encode( rText, uricNoSlash, rtl_UriEncodeCheckEscapes, RTL_TEXTENCODING_UTF8 ); + static constexpr auto uricNoSlash = rtl::createUriCharClass( + u8"!$&'()*+-.0123456789:=?@ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~"); + + + return + Uri::encode( rText, uricNoSlash.data(), rtl_UriEncodeCheckEscapes, RTL_TEXTENCODING_UTF8 ); } OUString string_decode( const OUString & rText ) diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx index ac37da853a83..a8203a811ce0 100644 --- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx +++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx @@ -129,25 +129,10 @@ OUString parsePart( } OUString encodeNameOrParamFragment(OUString const & fragment) { - static sal_Bool const nameOrParamFragment[] = { - false, false, false, false, false, false, false, false, - false, false, false, false, false, false, false, false, - false, false, false, false, false, false, false, false, - false, false, false, false, false, false, false, false, - false, true, false, false, true, false, false, true, // !"#$%&' - true, true, true, true, true, true, true, false, // ()*+,-./ - true, true, true, true, true, true, true, true, // 01234567 - true, true, true, true, false, false, false, false, // 89:;<=>? - true, true, true, true, true, true, true, true, // @ABCDEFG - true, true, true, true, true, true, true, true, // HIJKLMNO - true, true, true, true, true, true, true, true, // PQRSTUVW - true, true, true, true, false, true, false, true, // XYZ[\]^_ - false, true, true, true, true, true, true, true, // `abcdefg - true, true, true, true, true, true, true, true, // hijklmno - true, true, true, true, true, true, true, true, // pqrstuvw - true, true, true, false, false, false, true, false}; // xyz{|}~ + static constexpr auto nameOrParamFragment = rtl::createUriCharClass( + u8"!$'()*+,-.0123456789:;@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]_abcdefghijklmnopqrstuvwxyz~"); return rtl::Uri::encode( - fragment, nameOrParamFragment, rtl_UriEncodeIgnoreEscapes, + fragment, nameOrParamFragment.data(), rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8); } |