4 files changed, 8 insertions, 8 deletions
diff --git a/codemaker/source/codemaker/codemaker.cxx b/codemaker/source/codemaker/codemaker.cxx
index cb797533e2b9..df93ed2f5662 100644
--- a/codemaker/source/codemaker/codemaker.cxx
+++ b/codemaker/source/codemaker/codemaker.cxx
@@ -36,7 +36,7 @@ OString convertString(OUString const & string) {
              | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
     {
         throw CannotDumpException(
-            "Failure converting string from UTF-16 to UTF-8");
+            u"Failure converting string from UTF-16 to UTF-8"_ustr);
     }
     return s;
 }
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 6d831b45dca8..2862336b15bb 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -22,6 +22,7 @@
 #include <rtl/ustring.hxx>
 #include <osl/thread.h>
 #include <osl/file.hxx>
+#include <o3tl/string_view.hxx>
 
 #include <string.h>
 #include <string_view>
@@ -58,7 +59,7 @@ OString getTempDir(const OString& sFileName)
     if ((index=sFileName.lastIndexOf('\\')) > 0)
         return sFileName.copy(0, index);
 #endif
-    return ".";
+    return "."_ostr;
 }
 
 OString createFileNameFromType( const OString& destination,
@@ -96,8 +97,7 @@ OString createFileNameFromType( const OString& destination,
     if (bWithSeparator)
         fileNameBuf.append("/");
 
-    fileNameBuf.append(type);
-    fileNameBuf.append(postfix);
+    fileNameBuf.append(type + postfix);
 
     OString fileName(fileNameBuf.makeStringAndClear());
 
@@ -115,7 +115,7 @@ OString createFileNameFromType( const OString& destination,
     sal_Int32 nIndex = 0;
     do
     {
-        buffer.append(fileName.getToken(0, token, nIndex));
+        buffer.append(o3tl::getToken(fileName, 0, token, nIndex));
         if( nIndex == -1 )
             break;
 
@@ -272,7 +272,7 @@ bool FileStream::isValid() const
 
 void FileStream::createTempFile(const OString& sPath)
 {
-    OString sTmp(".");
+    OString sTmp("."_ostr);
     OUString sTmpPath;
     OUString sTmpName;
 
diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx
index 2d85b35a9823..906ae69ecba1 100644
--- a/codemaker/source/codemaker/options.cxx
+++ b/codemaker/source/codemaker/options.cxx
@@ -33,7 +33,7 @@ const OString& Options::getOption(const OString& option) const
     OptionMap::const_iterator i(m_options.find(option));
     if (i == m_options.end())
     {
-        throw IllegalArgument("Option is not valid or currently not set.");
+        throw IllegalArgument("Option is not valid or currently not set."_ostr);
     }
     return i->second;
 }
diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx
index 194840ca9d5b..48588e2c4200 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -62,7 +62,7 @@ codemaker::UnoType::Sort TypeManager::getSort(
 {
     if (name.isEmpty()) {
         if (cursor != nullptr) {
-            *cursor = manager_->createCursor("");
+            *cursor = manager_->createCursor(u""_ustr);
         }
         return codemaker::UnoType::Sort::Module;
     }