diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-29 12:24:31 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-29 18:25:31 +0200 |
commit | 04aafba860f613c20e7078d038cc83eb02de0b54 (patch) | |
tree | 8153152b87089419bde17313d9ac7b9de6fcce32 /desktop | |
parent | 76c793d2acf66f46e9edcda43d2f4327e8374841 (diff) |
loplugin:stringadd simplify some *StringBuffer operations
pulled from a larger patch which I created with a more permissive
variant of this plugin
Change-Id: I7abf1f3f09e84703b6e0e52fe9587dff691b2187
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114875
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/dispatchwatcher.cxx | 17 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 7 | ||||
-rw-r--r-- | desktop/source/deployment/manager/dp_properties.cxx | 9 | ||||
-rw-r--r-- | desktop/source/deployment/registry/package/dp_package.cxx | 15 |
4 files changed, 20 insertions, 28 deletions
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 9dea7779405a..a2e79d8283ae 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -93,14 +93,13 @@ struct DispatchHolder std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( std::u16string_view rUrl, std::u16string_view rFactory ) { // create the list of filters - OUStringBuffer sQuery(256); - sQuery.append("getSortedFilterList()"); - sQuery.append(":module="); - sQuery.append(rFactory); // use long name here ! - sQuery.append(":iflags="); - sQuery.append(OUString::number(static_cast<sal_Int32>(SfxFilterFlags::EXPORT))); - sQuery.append(":eflags="); - sQuery.append(OUString::number(static_cast<int>(SFX_FILTER_NOTINSTALLED))); + OUString sQuery = "getSortedFilterList()" + ":module=" + + OUString::Concat(rFactory) + // use long name here ! + ":iflags=" + + OUString::number(static_cast<sal_Int32>(SfxFilterFlags::EXPORT)) + + ":eflags=" + + OUString::number(static_cast<int>(SFX_FILTER_NOTINSTALLED)); const Reference< XComponentContext > xContext( comphelper::getProcessComponentContext() ); const Reference< XContainerQuery > xFilterFactory( @@ -110,7 +109,7 @@ std::shared_ptr<const SfxFilter> impl_lookupExportFilterForUrl( std::u16string_v std::shared_ptr<const SfxFilter> pBestMatch; const Reference< XEnumeration > xFilterEnum( - xFilterFactory->createSubSetEnumerationByQuery( sQuery.makeStringAndClear() ), UNO_SET_THROW ); + xFilterFactory->createSubSetEnumerationByQuery( sQuery ), UNO_SET_THROW ); while ( xFilterEnum->hasMoreElements() ) { comphelper::SequenceAsHashMap aFilterProps( xFilterEnum->nextElement() ); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index a3c33f6d639d..730854127ac2 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -640,11 +640,8 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() supportedFilters.append(filter); if ( ! insertion.second ) { // already existing, append extensions: - OUStringBuffer buf; - buf.append( insertion.first->second ); - buf.append( ';' ); - buf.append( filter ); - insertion.first->second = buf.makeStringAndClear(); + insertion.first->second = insertion.first->second + + ";" + filter; } } } diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx index 92d7191111d3..75a499ffda9e 100644 --- a/desktop/source/deployment/manager/dp_properties.cxx +++ b/desktop/source/deployment/manager/dp_properties.cxx @@ -103,17 +103,14 @@ OUString ExtensionProperties::getPropertyValue(css::beans::NamedValue const & v) void ExtensionProperties::write() { ::ucbhelper::Content contentProps(m_propFileUrl, m_xCmdEnv, m_xContext); - OUStringBuffer buf; + OUString buf; if (m_prop_suppress_license) { - buf.append(PROP_SUPPRESS_LICENSE); - buf.append("="); - buf.append(*m_prop_suppress_license); + buf = OUString::Concat(PROP_SUPPRESS_LICENSE) + "=" + *m_prop_suppress_license; } - OString stamp = OUStringToOString( - buf.makeStringAndClear(), RTL_TEXTENCODING_UTF8); + OString stamp = OUStringToOString(buf, RTL_TEXTENCODING_UTF8); Reference<css::io::XInputStream> xData( ::xmlscript::createInputStream( reinterpret_cast<sal_Int8 const *>(stamp.getStr()), diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 3cdf121438e9..f2dd75ccca6e 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -1001,14 +1001,13 @@ void BackendImpl::PackageImpl::exportTo( } erase_path( destURL, xCmdEnv ); - OUStringBuffer buf; - buf.append( "vnd.sun.star.zip://" ); - buf.append( ::rtl::Uri::encode( destURL, - rtl_UriCharClassRegName, - rtl_UriEncodeIgnoreEscapes, - RTL_TEXTENCODING_UTF8 ) ); - buf.append( '/' ); - OUString destFolder( buf.makeStringAndClear() ); + OUString destFolder = + "vnd.sun.star.zip://" + + ::rtl::Uri::encode( destURL, + rtl_UriCharClassRegName, + rtl_UriEncodeIgnoreEscapes, + RTL_TEXTENCODING_UTF8 ) + + "/"; ::ucbhelper::Content destFolderContent( destFolder, xCmdEnv, getMyBackend()->getComponentContext() ); |