summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/mork/MNSINIParser.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 /connectivity/source/drivers/mork/MNSINIParser.cxx
parente36dae401fc8963c9a92cb2c11d9b650b943c6d3 (diff)
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 'connectivity/source/drivers/mork/MNSINIParser.cxx')
-rw-r--r--connectivity/source/drivers/mork/MNSINIParser.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/connectivity/source/drivers/mork/MNSINIParser.cxx b/connectivity/source/drivers/mork/MNSINIParser.cxx
index ff8f932ff12b..b33baa1e82df 100644
--- a/connectivity/source/drivers/mork/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mork/MNSINIParser.cxx
@@ -60,7 +60,8 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce
struct ini_NameValue nameValue;
nameValue.sName = OStringToOUString(
line.copy(0,nIndex).trim(), RTL_TEXTENCODING_ASCII_US );
- nameValue.sValue = OUString::fromUtf8( line.copy(nIndex+1).trim() );
+ nameValue.sValue = OStringToOUString(
+ line.copy(nIndex+1).trim(), RTL_TEXTENCODING_UTF8 );
aSection->lList.push_back(nameValue);