diff options
| author | Noel <noelgrandin@gmail.com> | 2020-11-06 20:01:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-11 11:58:37 +0100 |
| commit | 93c64a61f2c84e684050294a1391cd32425b7837 (patch) | |
| tree | 00aad2cb8f3ee29ba4ac99e159e26fb8d71d2f33 /unodevtools | |
| parent | 1fde62018c8d3344a3408c7b6317120aefc778fb (diff) | |
loplugin:stringview
Add new methods "subView" to O(U)String to return substring views
of the underlying data.
Add a clang plugin to warn when replacing existing calls to copy()
would be better to use subView().
Change-Id: I03a5732431ce60808946f2ce2c923b22845689ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105420
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unodevtools')
| -rw-r--r-- | unodevtools/source/skeletonmaker/javatypemaker.cxx | 2 | ||||
| -rw-r--r-- | unodevtools/source/unodevtools/options.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx index ea373dac520e..be65870b56ad 100644 --- a/unodevtools/source/skeletonmaker/javatypemaker.cxx +++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx @@ -331,7 +331,7 @@ static void printSetPropertyMixinBody( do { OString s(fieldtype.getToken(0, '<', nPos)); - OString t{ "((" + s.copy(s.lastIndexOf('/')+1) + ")" }; + OString t{ OString::Concat("((") + s.subView(s.lastIndexOf('/')+1) + ")" }; if ( t == "((Optional)" ) { optional=true; diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx index 43948067359e..98db9cae00ae 100644 --- a/unodevtools/source/unodevtools/options.cxx +++ b/unodevtools/source/unodevtools/options.cxx @@ -40,13 +40,13 @@ bool readOption( OUString * pValue, const char * pOpt, if (aArg.getLength() < aOpt.getLength()) return false; - if (aOpt.equalsIgnoreAsciiCase( aArg.copy(1) )) { + if (aOpt.equalsIgnoreAsciiCase( aArg.subView(1) )) { // take next argument ++(*pnIndex); rtl_getAppCommandArg(*pnIndex, &pValue->pData); if (*pnIndex >= rtl_getAppCommandArgCount() || - pValue->copy(1) == dash) + pValue->subView(1) == dash) { throw CannotDumpException( "incomplete option \"-" + aOpt + "\" given!"); @@ -70,8 +70,8 @@ bool readOption( const char * pOpt, { OUString aOpt = OUString::createFromAscii(pOpt); - if((aArg.startsWith("-") && aOpt.equalsIgnoreAsciiCase(aArg.copy(1))) || - (aArg.startsWith("--") && aOpt.equalsIgnoreAsciiCase(aArg.copy(2))) ) + if((aArg.startsWith("-") && aOpt.equalsIgnoreAsciiCase(aArg.subView(1))) || + (aArg.startsWith("--") && aOpt.equalsIgnoreAsciiCase(aArg.subView(2))) ) { ++(*pnIndex); SAL_INFO("unodevtools", "identified option --" << pOpt); |