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>

2 files changed, 6 insertions, 6 deletions

diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx
index 09688ba2837d..3a35be56a39b 100644
--- a/codemaker/source/javamaker/javamaker.cxx
+++ b/codemaker/source/javamaker/javamaker.cxx
@@ -54,7 +54,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
         }
         codemaker::GeneratedTypeSet generated;
         if (options.isValid("-T")) {
-            OUString names(OUString::fromUtf8(options.getOption("-T")));
+            OUString names(b2u(options.getOption("-T")));
             for (sal_Int32 i = 0; i != -1;) {
                 OUString name(names.getToken(0, ';', i));
                 if (!name.isEmpty()) {
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index da7360f4273d..3130389e916b 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -613,7 +613,7 @@ void writeClassFile(
     tempfile.createTempFile(getTempDir(filename));
     if (!tempfile.isValid()) {
         throw CannotDumpException(
-            "Cannot create temporary file for " + OUString::fromUtf8(filename));
+            "Cannot create temporary file for " + b2u(filename));
     }
     OString tempname(tempfile.getName());
     try {
@@ -630,8 +630,8 @@ void writeClassFile(
     tempfile.close();
     if (!makeValidTypeFile(filename, tempname, bCheck)) {
         throw CannotDumpException(
-            "Cannot create " + OUString::fromUtf8(filename) + " from temporary file "
-            + OUString::fromUtf8(tempname));
+            "Cannot create " + b2u(filename) + " from temporary file "
+            + b2u(tempname));
     }
 }
 
@@ -2442,10 +2442,10 @@ void produce(
     OUString const & name, rtl::Reference< TypeManager > const & manager,
     codemaker::GeneratedTypeSet & generated, JavaOptions const & options)
 {
-    if (generated.contains(name.toUtf8())) {
+    if (generated.contains(u2b(name))) {
         return;
     }
-    generated.add(name.toUtf8());
+    generated.add(u2b(name));
     if (!manager->foundAtPrimaryProvider(name)) {
         return;
     }