strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix type of cppuhelper::TypeManager::getInterfaceMember separator param

Browse source 
...after a5343a89f8 "use more string_view in cppu"

Change-Id: I7cd577f50cd92586e00f347b2e05247b6b5b0331
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135326
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2022-06-02 21:09:09 +02:00
parent ad67d0c99a
commit e3b48ed3b8
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cppuhelper/source/typemanager.cxx
View file

@ -2147,9 +2147,9 @@ css::uno::Any cppuhelper::TypeManager::getInstantiatedStruct(
} }
css::uno::Any cppuhelper::TypeManager::getInterfaceMember( css::uno::Any cppuhelper::TypeManager::getInterfaceMember(
std::u16string_view name, sal_Int32 separator) std::u16string_view name, std::size_t separator)
{ {
assert(static_cast<sal_Int32>(name.find(u"::")) == separator && separator != -1); assert(name.find(u"::") == separator && separator != std::u16string_view::npos);
css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > ifc( css::uno::Reference< css::reflection::XInterfaceTypeDescription2 > ifc(
resolveTypedefs(find(OUString(name.substr(0, separator)))), css::uno::UNO_QUERY); resolveTypedefs(find(OUString(name.substr(0, separator)))), css::uno::UNO_QUERY);
if (!ifc.is()) { if (!ifc.is()) {

4
cppuhelper/source/typemanager.hxx
View file

@ -11,6 +11,8 @@
#include <sal/config.h> #include <sal/config.h>
#include <cstddef>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XSet.hpp> #include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
@ -100,7 +102,7 @@ private:
OUString const & name, sal_Int32 separator); OUString const & name, sal_Int32 separator);
css::uno::Any getInterfaceMember( css::uno::Any getInterfaceMember(
std::u16string_view name, sal_Int32 separator); std::u16string_view name, std::size_t separator);
css::uno::Any getNamed( css::uno::Any getNamed(
OUString const & name, OUString const & name,