summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2022-04-21 21:09:07 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-04-22 13:27:56 +0200
commit9820f11ad2b1ef32e5527eec519b0a7c766e2602 (patch)
tree2ffa9a42bed16ab9a790d78b8f42a76996fdbe01 /cppuhelper
parente4d1731ba3e8bac2801d1b76cfb66bf7f9795468 (diff)
address review comments on "use more string in unoidl.."
on commit 2d9291b9433c9645b0870525211f74bfb1151555 Author: Noel Grandin <noel.grandin@collabora.co.uk> Date: Thu Apr 21 12:53:15 2022 +0200 use more string_view in unoidl,codemaker Primarily reverting the findEntity call-chain to use OUString instead of std::u16string_view. Change-Id: Ib01b9473c859bba3791563df753823bbf0a87ce0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133302 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/typemanager.cxx4
-rw-r--r--cppuhelper/source/typemanager.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx
index 0b19954f92d5..44105df033fa 100644
--- a/cppuhelper/source/typemanager.cxx
+++ b/cppuhelper/source/typemanager.cxx
@@ -2102,7 +2102,7 @@ css::uno::Any cppuhelper::TypeManager::getInstantiatedStruct(
OUString const & name, sal_Int32 separator)
{
assert(name.indexOf('<') == separator && separator != -1);
- rtl::Reference< unoidl::Entity > ent(findEntity(name.subView(0, separator)));
+ rtl::Reference< unoidl::Entity > ent(findEntity(name.copy(0, separator)));
if (!ent.is()
|| (ent->getSort()
!= unoidl::Entity::SORT_POLYMORPHIC_STRUCT_TYPE_TEMPLATE))
@@ -2289,7 +2289,7 @@ css::uno::Any cppuhelper::TypeManager::getConstant(
}
rtl::Reference< unoidl::Entity > cppuhelper::TypeManager::findEntity(
- std::u16string_view name)
+ OUString const & name)
{
try {
return manager_->findEntity(name);
diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx
index 615495ca7f80..28c193191267 100644
--- a/cppuhelper/source/typemanager.hxx
+++ b/cppuhelper/source/typemanager.hxx
@@ -115,7 +115,7 @@ private:
rtl::Reference< unoidl::ConstantGroupEntity > const & entity,
OUString const & member);
- rtl::Reference< unoidl::Entity > findEntity(std::u16string_view name);
+ rtl::Reference< unoidl::Entity > findEntity(OUString const & name);
rtl::Reference< unoidl::Manager > manager_;
};