diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-11-02 18:55:59 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-11-02 19:49:04 +0100 |
| commit | c9b100df77331ebe1f5e66b9dd248c8cc43a885f (patch) | |
| tree | 5e22351a94f4ecfc468438ea28349ca9ec9c330f /sfx2 | |
| parent | b0e574a8be2a080f5039e968f4f32ce4b8fa2b26 (diff) | |
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>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/view/frmload.cxx | 14 |
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; |