From ef513fd4b049b214a03fbe6e62a5ea43680a7a9b Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 26 May 2017 10:58:42 +0200
Subject: remove unnecessary use of OString::getStr

Change-Id: I0490efedf459190521f4339854b3394d57765fdb
Reviewed-on: https://gerrit.libreoffice.org/38058
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 unodevtools/source/skeletonmaker/cpptypemaker.cxx  | 6 +++---
 unodevtools/source/skeletonmaker/javatypemaker.cxx | 6 +++---
 unodevtools/source/skeletonmaker/skeletonmaker.cxx | 5 +----
 3 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'unodevtools/source')

diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index 1fdeabd15201..936b5841a479 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -555,7 +555,7 @@ void printMethods(std::ostream & o,
                 }
             } else {
                 o << "\n" << indentation << "{\n" << indentation << "    return "
-                  << delegate.getStr() << "get" << i->name << "();\n"
+                  << delegate << "get" << i->name << "();\n"
                   << indentation << "}\n\n";
             }
         } else {
@@ -589,7 +589,7 @@ void printMethods(std::ostream & o,
                     }
                 } else {
                     o << "\n" << indentation << "{\n" << indentation << "    "
-                      << delegate.getStr() << "set" << i->name
+                      << delegate << "set" << i->name
                       << "(the_value);\n" << indentation << "}\n\n";
                 }
             } else {
@@ -638,7 +638,7 @@ void printMethods(std::ostream & o,
                 if (i->returnType != "void")
                     o << "return ";
 
-                o << delegate.getStr() << i->name << '(';
+                o << delegate << i->name << '(';
                 printMethodParameters(
                     o, options, manager, i->parameters, false);
                 o << ");\n" << indentation << "}\n\n";
diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx
index e097b831be90..ec60403064c6 100644
--- a/unodevtools/source/skeletonmaker/javatypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx
@@ -493,7 +493,7 @@ void printMethods(std::ostream & o,
                 }
             } else {
                 o << "\n" << indentation << "{\n" << indentation
-                  << "    return " << delegate.getStr() << "get" << i->name
+                  << "    return " << delegate << "get" << i->name
                   << "();\n" << indentation << "}\n\n";
             }
         } else {
@@ -516,7 +516,7 @@ void printMethods(std::ostream & o,
                     }
                 } else {
                     o << "\n" << indentation << "{\n" << indentation
-                      << "    " << delegate.getStr() << "set" << i->name
+                      << "    " << delegate << "set" << i->name
                       << "(the_value);\n" << indentation << "}\n\n";
                 }
             } else {
@@ -559,7 +559,7 @@ void printMethods(std::ostream & o,
                 if (i->returnType != "void") {
                     o << "return ";
                 }
-                o << delegate.getStr() << i->name << '(';
+                o << delegate << i->name << '(';
                 printMethodParameters(
                     o, options, manager, i->parameters, false);
                 o << ");\n" << indentation << "}\n\n";
diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
index e2f97695997d..e5b8d5837a6e 100644
--- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
+++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
@@ -164,10 +164,7 @@ SAL_IMPLEMENT_MAIN()
                   << " Version " << version << "\n\n";
         exit(EXIT_SUCCESS);
     } else {
-        std::cerr
-            << "ERROR: unexpected command \""
-            << OUStringToOString(arg, RTL_TEXTENCODING_UTF8).getStr()
-            << "\"!\n";
+        std::cerr << "ERROR: unexpected command \"" << arg << "\"!\n";
         printUsageAndExit(programname, version);
         exit(EXIT_FAILURE);
     }
-- 
cgit