summaryrefslogtreecommitdiffstats
path: root/idlc/source/idlcproduce.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-06 17:24:13 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-06 17:24:13 +0100
commitfc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch)
tree49a72b76d2d2a92af6371748c19277778159b86d /idlc/source/idlcproduce.cxx
parentimplement toggling off removeable master elements with direct delete (diff)
downloadcore-fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5.tar.gz
core-fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5.zip
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).
Diffstat (limited to 'idlc/source/idlcproduce.cxx')
-rw-r--r--idlc/source/idlcproduce.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx
index d7dd9f1c7946..35a3a20a5517 100644
--- a/idlc/source/idlcproduce.cxx
+++ b/idlc/source/idlcproduce.cxx
@@ -119,7 +119,7 @@ static bool cleanPath()
void removeIfExists(const OString& pathname)
{
- osl::File::remove(OUString::fromUtf8(pathname));
+ osl::File::remove(OStringToOUString(pathname, RTL_TEXTENCODING_UTF8));
}
sal_Int32 SAL_CALL
@@ -154,7 +154,7 @@ produceFile(const OString& regFileName, sPair_t const*const pDepFile)
OString urlRegTmpName = convertToFileUrl(regTmpName);
Registry regFile;
- if ( regFile.create(OUString::fromUtf8(urlRegTmpName)) != REG_NO_ERROR )
+ if ( regFile.create(OStringToOUString(urlRegTmpName, RTL_TEXTENCODING_UTF8)) != REG_NO_ERROR )
{
fprintf(stderr, "%s: could not create registry file '%s'\n",
pOptions->getProgramName().getStr(), regTmpName.getStr());
@@ -184,7 +184,7 @@ produceFile(const OString& regFileName, sPair_t const*const pDepFile)
fprintf(stderr, "%s: could not close registry file '%s'\n",
pOptions->getProgramName().getStr(), regFileName.getStr());
}
- regFile.destroy(OUString::fromUtf8(regFileName));
+ regFile.destroy(OStringToOUString(regFileName, RTL_TEXTENCODING_UTF8));
removeIfExists(regFileName);
cleanPath();
return 1;