Drop char*-based API from NamedValueCollection

Change-Id: I87f339b348580e256a8d65470ad15cbdabf2c9dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124609
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index b18b76efdd7c..91b045b2f1a3 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -501,18 +501,16 @@ void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCo
 
 ::comphelper::NamedValueCollection SfxFrameLoader_Impl::impl_extractViewCreationArgs( ::comphelper::NamedValueCollection& io_rDescriptor )
 {
-    static const char* pKnownViewArgs[] = {
-        "JumpMark",
-        "PickListEntry"
-    };
+    static const std::u16string_view sKnownViewArgs[] = { u"JumpMark", u"PickListEntry" };
 
     ::comphelper::NamedValueCollection aViewArgs;
-    for (const char* pKnownViewArg : pKnownViewArgs)
+    for (const auto& rKnownViewArg : sKnownViewArgs)
     {
-        if ( io_rDescriptor.has( pKnownViewArg ) )
+        const OUString sKnownViewArg(rKnownViewArg);
+        if ( io_rDescriptor.has( sKnownViewArg ) )
         {
-            aViewArgs.put( pKnownViewArg, io_rDescriptor.get( pKnownViewArg ) );
-            io_rDescriptor.remove( pKnownViewArg );
+            aViewArgs.put( sKnownViewArg, io_rDescriptor.get( sKnownViewArg ) );
+            io_rDescriptor.remove( sKnownViewArg );
         }
     }
     return aViewArgs;