summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-10-01 09:09:45 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-10-11 14:22:22 +0200
commit4f5b3e4bd53d6d61df1f65f496f7bc8dc525c8a1 (patch)
treee0ac44b8f22f944f3303bac8e494da41d6c7b164 /stoc
parent5f84c44e3d5ff19b800b6358e61228546e318d4f (diff)
In O[U]StringBuffer, make string_view params replacements for OUString ones
...for LIBO_INTERNAL_ONLY, instead of having them as additional overloads. That way, loplugin:bufferadd and loplugin:stringviewparam found many further opportunities for simplification (all addressed here). Some notes: * There is no longer an implicit conversion from O[U]String to O[U]StringBuffer (as that goes via user-defined conversions through string_view now), which was most noticeable in copy initializations like OStringBuffer buf = someStr; that had to be changed to direct initialization, OStringBuffer buf(someStr); But then again, it wasn't too many places that were affected and I think we can live with that. * I made the O[U]StringBuffer ctors taking string_view non-explicit, mainly to get them in line with their counterparts taking O[U]String. * I added an OUStringBuffer::lastIndexOf string_view overload that was missing (relative to OUStringBuffer::indexOf). * loplugin:stringconstant needed some addition to keep the compilerplugins/clang/test/stringconstant.cxx checks related to OStringBuffer::append and OStringBuffer::insert working. * loplugin:stringviewparam no longer needs the special O[U]StringBuffer-related code that had been introduced in 1250aecd71fabde4dba990bfceb61bbe8e06b8ea "loplugin:stringviewparam extend to new.." Change-Id: Ib1bb8c4632d99b744e742605a9fef6eae959fd72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122904 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/security/permissions.cxx24
1 files changed, 7 insertions, 17 deletions
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index 86e523e5a9fe..987b07ed8997 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -311,17 +311,11 @@ FilePermission::FilePermission(
if ( m_url == "*" )
{
- OUStringBuffer buf( 64 );
- buf.append( getWorkingDir() );
- buf.append( "/*" );
- m_url = buf.makeStringAndClear();
+ m_url = getWorkingDir() + "/*";
}
else if ( m_url == "-" )
{
- OUStringBuffer buf( 64 );
- buf.append( getWorkingDir() );
- buf.append( "/-" );
- m_url = buf.makeStringAndClear();
+ m_url = getWorkingDir() + "/-";
}
else if (!m_url.startsWith("file:///"))
{
@@ -401,15 +395,11 @@ bool FilePermission::implies( Permission const & perm ) const
OUString FilePermission::toString() const
{
- OUStringBuffer buf( 48 );
- // url
- buf.append( "com.sun.star.io.FilePermission (url=\"" );
- buf.append( m_url );
- // actions
- buf.append( "\", actions=\"" );
- buf.append( makeStrings( m_actions, s_actions ) );
- buf.append( "\")" );
- return buf.makeStringAndClear();
+ return
+ // url
+ "com.sun.star.io.FilePermission (url=\"" + m_url
+ // actions
+ + "\", actions=\"" + makeStrings( m_actions, s_actions ) + "\")";
}
namespace {