2 files changed, 10 insertions, 34 deletions
diff --git a/compilerplugins/clang/test/stringstatic.cxx b/compilerplugins/clang/test/stringstatic.cxx
index bfe92b69f598..7e2089a17da7 100644
--- a/compilerplugins/clang/test/stringstatic.cxx
+++ b/compilerplugins/clang/test/stringstatic.cxx
@@ -9,22 +9,21 @@
 
 #include <rtl/ustring.hxx>
 
-#include "stringstatic.hxx"
-
-// expected-error@+1 {{rather declare this using OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
+// expected-error@+1 {{rather declare this as constexpr [loplugin:stringstatic]}}
 static const OUString TEST1 = "xxx";
-
-void f(rtl_uString const*);
-void f(const OUString&);
+static constexpr OUString TEST2 = u"xxx"_ustr;
 
 void test2()
 {
-    // expected-error@+1 {{rather declare this using OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
+    (void)TEST2;
+    // expected-error@+1 {{rather declare this as constexpr [loplugin:stringstatic]}}
     static const OUString XXX = "xxx";
-    // expected-error@+1 {{rather declare this using OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
-    static const OUString XXX2 = "xxx";
+    static constexpr OUString XXX2 = u"xxx"_ustr;
     (void)XXX;
     (void)XXX2;
-    static const OUString DATA = "xxx";
-    f(DATA.pData);
+    // expected-error@+1 {{rather declare this as constexpr [loplugin:stringstatic]}}
+    static const OUString A1[1] = { u"xxx"_ustr };
+    static constexpr OUString A2[1] = { u"xxx"_ustr };
+    (void)A1;
+    (void)A2;
 }
diff --git a/compilerplugins/clang/test/stringstatic.hxx b/compilerplugins/clang/test/stringstatic.hxx
deleted file mode 100644
index ec82a8bf5deb..000000000000
--- a/compilerplugins/clang/test/stringstatic.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "sal/config.h"
-
-#include "rtl/ustring.hxx"
-
-OUString const INCLUDED = "xxx";
-
-inline void f()
-{
-    // expected-error@+1 {{rather declare this using OUStringLiteral/OStringLiteral/char[] [loplugin:stringstatic]}}
-    static OUString const XXX = "xxx";
-    (void)XXX;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */