summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-04-12 12:43:11 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-04-13 08:38:53 +0200
commitfdfd517a6f75e394ddcb1e195decbfed33ba56b9 (patch)
treee3bff14e5531affcd908415b4e85d7ceac4aa1fd /forms
parente568c9dca8b93b96a8a130a8fb6f1bba1a33d6ea (diff)
loplugin:stringviewparam whitelist some more functions
for which we have o3tl:: equivalents Change-Id: I4670fd8b703ac47214be213f41e88d1c6ede7032 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132913 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'forms')
-rw-r--r--forms/source/xforms/convert.cxx4
-rw-r--r--forms/source/xforms/submission/replace.cxx11
-rw-r--r--forms/source/xforms/submission/submission.hxx2
3 files changed, 9 insertions, 8 deletions
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 773cbfd6f925..278d5b01f597 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -85,7 +85,7 @@ namespace
}
- css::util::Date lcl_toUNODate( const OUString& rString )
+ css::util::Date lcl_toUNODate( std::u16string_view rString )
{
css::util::Date aDate( 1, 1, 1900 );
@@ -217,7 +217,7 @@ namespace
}
else
{
- aDate = lcl_toUNODate( rString.copy( 0, nDateTimeSep ) );
+ aDate = lcl_toUNODate( rString.subView( 0, nDateTimeSep ) );
aTime = lcl_toUNOTime( rString.subView( nDateTimeSep + 1 ) );
}
css::util::DateTime aDateTime(
diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx
index e0595736b712..77e628728534 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -24,6 +24,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ref.hxx>
#include <tools/diagnose_ex.h>
+#include <o3tl/string_view.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Reference.hxx>
@@ -43,15 +44,15 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::task;
using namespace com::sun::star::xml::dom;
-CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, const Reference<XDocument>& aDocument, const Reference<XFrame>& aFrame)
+CSubmission::SubmissionResult CSubmission::replace(std::u16string_view aReplace, const Reference<XDocument>& aDocument, const Reference<XFrame>& aFrame)
{
if (!m_aResultStream.is())
return CSubmission::UNKNOWN_ERROR;
try {
Reference< XComponentContext > xContext = comphelper::getProcessComponentContext();
- if (aReplace.equalsIgnoreAsciiCase("all")
- || aReplace.equalsIgnoreAsciiCase("document")) {
+ if (o3tl::equalsIgnoreAsciiCase(aReplace, u"all")
+ || o3tl::equalsIgnoreAsciiCase(aReplace, u"document")) {
Reference< XComponentLoader > xLoader;
if (aFrame.is())
xLoader.set(aFrame, UNO_QUERY);
@@ -73,7 +74,7 @@ CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, con
return CSubmission::SUCCESS;
- } else if (aReplace.equalsIgnoreAsciiCase("instance")) {
+ } else if (o3tl::equalsIgnoreAsciiCase(aReplace, u"instance")) {
if (aDocument.is()) {
// parse the result stream into a new document
Reference< XDocumentBuilder > xBuilder(DocumentBuilder::create(xContext));
@@ -94,7 +95,7 @@ CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, con
// nothing to replace
return CSubmission::UNKNOWN_ERROR;
}
- } else if (aReplace.equalsIgnoreAsciiCase("none")) {
+ } else if (o3tl::equalsIgnoreAsciiCase(aReplace, u"none")) {
// do nothing \o/
return CSubmission::SUCCESS;
}
diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx
index 655529063a7d..bb5a19ee362b 100644
--- a/forms/source/xforms/submission/submission.hxx
+++ b/forms/source/xforms/submission/submission.hxx
@@ -130,7 +130,7 @@ public:
virtual SubmissionResult submit(const css::uno::Reference< css::task::XInteractionHandler >& ) = 0;
- SubmissionResult replace(const OUString&, const css::uno::Reference< css::xml::dom::XDocument >&, const css::uno::Reference< css::frame::XFrame>&);
+ SubmissionResult replace(std::u16string_view, const css::uno::Reference< css::xml::dom::XDocument >&, const css::uno::Reference< css::frame::XFrame>&);
};