mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix master after string_view patches..

Browse Source 
crossed paths

Change-Id: I066b357dc10e2109658194b3b3682b7083ebbbbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133322
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2022-04-22 14:21:26 +02:00
parent 64cb1d10ff
commit c2092e4da4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cppuhelper/source/typemanager.cxx
View File

@@ -1873,7 +1873,7 @@ css::uno::Any cppuhelper::TypeManager::find(OUString const & name) {
} }
i = name.lastIndexOf('.'); i = name.lastIndexOf('.');
if (i != -1) { if (i != -1) {
std::u16string_view parent(name.subView(0, i)); OUString parent(name.copy(0, i));
ent = findEntity(parent); ent = findEntity(parent);
if (ent.is()) { if (ent.is()) {
switch (ent->getSort()) { switch (ent->getSort()) {
@@ -2072,7 +2072,7 @@ void cppuhelper::TypeManager::readRdbFile(
std::u16string_view uri, bool optional) std::u16string_view uri, bool optional)
{ {
try { try {
manager_->addProvider(uri); manager_->addProvider(OUString(uri));
} catch (unoidl::NoSuchFileException &) { } catch (unoidl::NoSuchFileException &) {
if (!optional) { if (!optional) {
throw css::uno::DeploymentException( throw css::uno::DeploymentException(