diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-05 11:41:39 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-04-05 16:13:14 +0200 |
| commit | dacde2c0394d33a04bc9ad929df394465c14b093 (patch) | |
| tree | 6669725646ddcf2bbf467b9dfb8c9739fe05139f /codemaker/source/codemaker | |
| parent | tdf#124287 wrong tooltip at Field command in NB (diff) | |
| download | core-dacde2c0394d33a04bc9ad929df394465c14b093.tar.gz core-dacde2c0394d33a04bc9ad929df394465c14b093.zip | |
Revert "Get rid of b2u/u2b helpers; use OUString's toUtf8/fromUtf8 instead"
This reverts commit 84662e9030a855c8db7cd40d9ce354b773d78c16.
Change-Id: I1cc98d3201390609ae3615baa8e92c926cdcde9a
Reviewed-on: https://gerrit.libreoffice.org/70294
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'codemaker/source/codemaker')
| -rw-r--r-- | codemaker/source/codemaker/exceptiontree.cxx | 6 | ||||
| -rw-r--r-- | codemaker/source/codemaker/typemanager.cxx | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx index 796f52671ce3..b6c2aeee6f87 100644 --- a/codemaker/source/codemaker/exceptiontree.cxx +++ b/codemaker/source/codemaker/exceptiontree.cxx @@ -55,10 +55,12 @@ void ExceptionTree::add( } list.push_back(n); rtl::Reference< unoidl::Entity > ent; - codemaker::UnoType::Sort s = manager->getSort(OUString::fromUtf8(n), &ent); + codemaker::UnoType::Sort s = manager->getSort(b2u(n), &ent); (void) s; // WaE: unused variable assert(s == codemaker::UnoType::Sort::Exception); - n = static_cast<unoidl::ExceptionTypeEntity*>(ent.get())->getDirectBase().toUtf8(); + n = u2b( + static_cast< unoidl::ExceptionTypeEntity * >(ent.get())-> + getDirectBase()); assert(!n.isEmpty()); } if (!bRuntimeException) { diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx index f723ee699948..cf638f0ca4eb 100644 --- a/codemaker/source/codemaker/typemanager.cxx +++ b/codemaker/source/codemaker/typemanager.cxx @@ -164,7 +164,7 @@ codemaker::UnoType::Sort TypeManager::decompose( { sal_Int32 k; std::vector< OString > args; - OUString n = OUString::fromUtf8(codemaker::UnoType::decompose(name.toUtf8(), &k, &args)); + OUString n = b2u(codemaker::UnoType::decompose(u2b(name), &k, &args)); for (;;) { rtl::Reference< unoidl::Entity > ent; codemaker::UnoType::Sort s = getSort(n, &ent); @@ -238,7 +238,7 @@ codemaker::UnoType::Sort TypeManager::decompose( arguments->clear(); for (const OString& rArg : args) { - arguments->push_back(OUString::fromUtf8(rArg)); + arguments->push_back(b2u(rArg)); } } if (entity != nullptr) { |