summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-28 17:56:40 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-29 16:42:33 +0100
commit042033f1e6da22616cb76c8d950c20c9efecbad5 (patch)
tree26b3f1f42d067506f44550b410f3fb9640616a5b /reportdesign
parentccfd8e9d09f9ac0a0ea92d0f378391006faaf934 (diff)
loplugin:stringviewparam: operator +
Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/qa/unit/reportdesign-dialogs-test.cxx2
-rw-r--r--reportdesign/source/ui/inc/GeometryHandler.hxx4
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx6
3 files changed, 7 insertions, 5 deletions
diff --git a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx b/reportdesign/qa/unit/reportdesign-dialogs-test.cxx
index 30e421409c41..0f3295ea602f 100644
--- a/reportdesign/qa/unit/reportdesign-dialogs-test.cxx
+++ b/reportdesign/qa/unit/reportdesign-dialogs-test.cxx
@@ -51,7 +51,7 @@ VclPtr<VclAbstractDialog> ReportdesignDialogsTest::createDialogByID(sal_uInt32 /
void ReportdesignDialogsTest::openAnyDialog()
{
/// process input file containing the UXMLDescriptions of the dialogs to dump
- processDialogBatchFile("reportdesign/qa/unit/data/reportdesign-dialogs-test.txt");
+ processDialogBatchFile(u"reportdesign/qa/unit/data/reportdesign-dialogs-test.txt");
}
CPPUNIT_TEST_SUITE_REGISTRATION(ReportdesignDialogsTest);
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index bd6b6e24c861..e5852694600d 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -35,6 +35,8 @@
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <map>
#include <memory>
+#include <string_view>
+
#include <comphelper/stl_types.hxx>
#include <comphelper/listenernotification.hxx>
@@ -218,7 +220,7 @@ namespace rptui
* \param _sFunction The name of the function.
* \param _sDataField The name of the data field.
*/
- void createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,const OUString& _sDataField);
+ void createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,std::u16string_view _sDataField);
void removeFunction();
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index b5b78e02f74e..52a2d46320e4 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -100,9 +100,9 @@ using namespace ::com::sun::star;
namespace{
-OUString lcl_getQuotedFunctionName(const OUString& _sFunction)
+OUString lcl_getQuotedFunctionName(std::u16string_view _sFunction)
{
- return "[" + _sFunction + "]";
+ return OUString::Concat("[") + _sFunction + "]";
}
OUString lcl_getQuotedFunctionName(const uno::Reference< report::XFunction>& _xFunction)
@@ -1914,7 +1914,7 @@ void GeometryHandler::loadDefaultFunctions()
m_aDefaultFunctions.push_back(aDefault);
}
-void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,const OUString& _sDataField)
+void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,std::u16string_view _sDataField)
{
try
{