summaryrefslogtreecommitdiff
path: root/svx/source
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 /svx/source
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 'svx/source')
-rw-r--r--svx/source/accessibility/AccessibleControlShape.cxx2
-rw-r--r--svx/source/accessibility/DescriptionGenerator.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx10
-rw-r--r--svx/source/form/formcontrolfactory.cxx2
-rw-r--r--svx/source/inc/fmshimp.hxx2
-rw-r--r--svx/source/inc/formcontrolfactory.hxx3
6 files changed, 11 insertions, 10 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index ef04fcb8625f..94e3aab617fe 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -341,7 +341,7 @@ OUString
break;
default:
- aDG.Initialize ("Unknown accessible control shape");
+ aDG.Initialize (u"Unknown accessible control shape");
if (mxShape.is())
{
aDG.AppendString (u"service name=");
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index 430f22c98c01..fe410914910f 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -57,7 +57,7 @@ void DescriptionGenerator::Initialize(TranslateId pResourceId)
Initialize(sPrefix);
}
-void DescriptionGenerator::Initialize(const OUString& sPrefix)
+void DescriptionGenerator::Initialize(std::u16string_view sPrefix)
{
msDescription = sPrefix;
if (!mxSet.is())
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index ff42f94a770d..3b5a070e4dee 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1410,7 +1410,7 @@ void FmXFormShell::ExecuteSearch_Lock()
FmFormArray().swap(m_aSearchForms);
::std::vector< OUString > aContextNames;
impl_collectFormSearchContexts_nothrow_Lock(
- m_pShell->GetCurPage()->GetForms(), OUString(),
+ m_pShell->GetCurPage()->GetForms(), u"",
m_aSearchForms, aContextNames);
if ( m_aSearchForms.size() != aContextNames.size() )
@@ -2841,7 +2841,7 @@ Reference< XControl> FmXFormShell::impl_getControl_Lock(const Reference<XControl
// note: _out_rForms is a member so needs lock
void FmXFormShell::impl_collectFormSearchContexts_nothrow_Lock( const Reference<XInterface>& _rxStartingPoint,
- const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames )
+ std::u16string_view _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames )
{
try
{
@@ -2867,14 +2867,14 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow_Lock( const Reference<
// the name of the current form
OUString sCompleteCurrentName( sCurrentFormName );
- if ( !_rCurrentLevelPrefix.isEmpty() )
+ if ( !_rCurrentLevelPrefix.empty() )
{
- sCompleteCurrentName += " (" + _rCurrentLevelPrefix + ")";
+ sCompleteCurrentName += OUString::Concat(" (") + _rCurrentLevelPrefix + ")";
}
// the prefix for the next level
aNextLevelPrefix = _rCurrentLevelPrefix;
- if ( !_rCurrentLevelPrefix.isEmpty() )
+ if ( !_rCurrentLevelPrefix.empty() )
aNextLevelPrefix.append( '/' );
aNextLevelPrefix.append( sCurrentFormName );
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index e98da0466786..678e00052de3 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -680,7 +680,7 @@ namespace svxform
}
- OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, const OUString& _rBaseName )
+ OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, std::u16string_view _rBaseName )
{
sal_Int32 n = 0;
OUString sName;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 4d3c55bc8aa1..4c511897babc 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -330,7 +330,7 @@ private:
// collects in strNames the names of all forms
SAL_DLLPRIVATE static void impl_collectFormSearchContexts_nothrow_Lock(
const css::uno::Reference< css::uno::XInterface>& _rxStartingPoint,
- const OUString& _rCurrentLevelPrefix,
+ std::u16string_view _rCurrentLevelPrefix,
FmFormArray& _out_rForms,
::std::vector< OUString >& _out_rNames );
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index 2ca1d6d066c0..27320cac54d5 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -30,6 +30,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <memory>
+#include <string_view>
class SdrUnoObj;
namespace tools { class Rectangle; }
@@ -91,7 +92,7 @@ namespace svxform
static OUString getUniqueName(
const css::uno::Reference< css::container::XNameAccess >& _rxContainer,
- const OUString& _rBaseName
+ std::u16string_view _rBaseName
);
private: