Revert "use the new OUString::fromUtf8 method"

This reverts commit 05050cdb23de586870bf479a9df5ced06828d498,
not all places that use e.g. OStringToOUString to convert potential UTF-8
are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and
some places like e.g. in codemaker are happy with the best-effort effect
of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).

5 files changed, 13 insertions, 10 deletions

diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 5c3f134904ab..5546e9eb5984 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -126,7 +126,8 @@ void InitPoFile(
     //Create directory for po file
     {
         OUString outDir =
-            OUString::fromUtf8(rPotDir.copy(0,rPotDir.lastIndexOf('/')));
+            OStringToOUString(
+                rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8);
         OUString outDirUrl;
         if (osl::FileBase::getFileURLFromSystemPath(outDir, outDirUrl)
             != osl::FileBase::E_None)
@@ -406,7 +407,8 @@ void handleDirectory(
 
     //Remove empty pot directory
     OUString sPoPath =
-        OUString::fromUtf8(rPotDir.copy(0,rPotDir.lastIndexOf('/')));
+        OStringToOUString(
+            rPotDir.copy(0,rPotDir.lastIndexOf('/')), RTL_TEXTENCODING_UTF8);
     OUString sPoUrl;
     if (osl::FileBase::getFileURLFromSystemPath(sPoPath, sPoUrl)
         != osl::FileBase::E_None)
diff --git a/l10ntools/source/pocheck.cxx b/l10ntools/source/pocheck.cxx
index e75581d34d6d..a1836caf0a7b 100644
--- a/l10ntools/source/pocheck.cxx
+++ b/l10ntools/source/pocheck.cxx
@@ -121,7 +121,7 @@ static void checkStyleNames(const OString& aLanguage)
     aPoInput.close();
     aPoOutput.close();
     OUString aPoPathURL;
-    osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(aPoPath), aPoPathURL);
+    osl::FileBase::getFileURLFromSystemPath(OStringToOUString(aPoPath, RTL_TEXTENCODING_UTF8), aPoPathURL);
     if( bAnyError )
         osl::File::move(aPoPathURL + ".new", aPoPathURL);
     else
@@ -343,7 +343,7 @@ static void checkFunctionNames(const OString& aLanguage)
         }
         aPoInput.close();
         aPoOutput.close();
-        osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(aPoPaths[i]), aPoPathURL);
+        osl::FileBase::getFileURLFromSystemPath(OStringToOUString(aPoPaths[i], RTL_TEXTENCODING_UTF8), aPoPathURL);
         if( bAnyError )
             osl::File::move(aPoPathURL + ".new", aPoPathURL);
         else
@@ -395,7 +395,7 @@ static void checkVerticalBar(const OString& aLanguage)
     aPoInput.close();
     aPoOutput.close();
     OUString aPoPathURL;
-    osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(aPoPath), aPoPathURL);
+    osl::FileBase::getFileURLFromSystemPath(OStringToOUString(aPoPath, RTL_TEXTENCODING_UTF8), aPoPathURL);
     if( bError )
         osl::File::move(aPoPathURL + ".new", aPoPathURL);
     else
@@ -444,7 +444,7 @@ static void checkMathSymbolNames(const OString& aLanguage)
     aPoInput.close();
     aPoOutput.close();
     OUString aPoPathURL;
-    osl::FileBase::getFileURLFromSystemPath(OUString::fromUtf8(aPoPath), aPoPathURL);
+    osl::FileBase::getFileURLFromSystemPath(OStringToOUString(aPoPath, RTL_TEXTENCODING_UTF8), aPoPathURL);
     if( bError )
         osl::File::move(aPoPathURL + ".new", aPoPathURL);
     else
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 25a7b15d6465..a41cd154d4c3 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -61,7 +61,8 @@ namespace
     //Escape unicode characters
     static void lcl_PrintJavaStyle( const OString& rText, std::ofstream &rOfstream )
     {
-        const OUString sTemp = OUString::fromUtf8( rText );
+        const OUString sTemp =
+            OStringToOUString( rText, RTL_TEXTENCODING_UTF8 );
         for ( sal_Int32 nIndex = 0; nIndex < sTemp.getLength(); ++nIndex )
         {
             sal_Unicode cUniCode = sTemp[nIndex];
diff --git a/l10ntools/source/uimerge.cxx b/l10ntools/source/uimerge.cxx
index 34612bffdb29..5954ab17c8d3 100644
--- a/l10ntools/source/uimerge.cxx
+++ b/l10ntools/source/uimerge.cxx
@@ -135,7 +135,7 @@ bool Merge(
     {
         bool bDestinationIsDir(false);
 
-        const OUString aDestDir(OUString::fromUtf8(rDestinationDir));
+        const OUString aDestDir(OStringToOUString(rDestinationDir, RTL_TEXTENCODING_UTF8));
         OUString aDestDirUrl;
         if (osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(aDestDir, aDestDirUrl))
         {
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index d82d4f30ca42..2c376cf8c675 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -799,7 +799,7 @@ namespace
 
 static OUString lcl_pathnameToAbsoluteUrl(const OString& rPathname)
 {
-    OUString sPath = OUString::fromUtf8(rPathname);
+    OUString sPath = OStringToOUString(rPathname, RTL_TEXTENCODING_UTF8 );
     OUString sUrl;
     if (osl::FileBase::getFileURLFromSystemPath(sPath, sUrl)
         != osl::FileBase::E_None)
@@ -1139,7 +1139,7 @@ OString XMLUtil::QuotHTML( const OString &rString )
         reinterpret_cast<const UChar*>(sPattern.getStr()),
         sPattern.getLength() );
 
-    const OUString sOUSource = OUString::fromUtf8(rString);
+    const OUString sOUSource = OStringToOUString(rString, RTL_TEXTENCODING_UTF8);
     icu::UnicodeString sSource(
         reinterpret_cast<const UChar*>(
             sOUSource.getStr()), sOUSource.getLength() );