From fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 6 Nov 2014 17:24:13 +0100 Subject: 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). --- sc/source/core/opencl/openclwrapper.cxx | 6 +++--- sc/source/core/tool/interpr2.cxx | 2 +- sc/source/core/tool/interpr7.cxx | 6 +++--- sc/source/filter/oox/numberformatsbuffer.cxx | 2 +- sc/source/filter/orcus/interface.cxx | 2 +- sc/source/ui/miscdlgs/mtrindlg.cxx | 3 ++- 6 files changed, 11 insertions(+), 10 deletions(-) (limited to 'sc') diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 7e54cfcf605f..23db69e7740e 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -154,7 +154,7 @@ std::vector > OpenCLDevice::binaryGenerated( const if ( mpArryDevsID[i] != 0 ) { OString fileName = createFileName(gpuEnv.mpArryDevsID[i], clFileName); - osl::File* pNewFile = new osl::File(rtl::OUString::fromUtf8(fileName)); + osl::File* pNewFile = new osl::File(rtl::OStringToOUString(fileName, RTL_TEXTENCODING_UTF8)); if(pNewFile->open(osl_File_OpenFlag_Read) == osl::FileBase::E_None) { aGeneratedFiles.push_back(boost::shared_ptr(pNewFile)); @@ -174,7 +174,7 @@ std::vector > OpenCLDevice::binaryGenerated( const bool OpenCLDevice::writeBinaryToFile( const OString& rFileName, const char* binary, size_t numBytes ) { - osl::File file(rtl::OUString::fromUtf8(rFileName)); + osl::File file(rtl::OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8)); osl::FileBase::RC status = file.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); @@ -345,7 +345,7 @@ bool buildProgram(const char* buildOption, GPUEnv* gpuInfo, int idx) } OString aBuildLogFileURL = OpenCLDevice::maCacheFolder + "kernel-build.log"; - osl::File aBuildLogFile(rtl::OUString::fromUtf8(aBuildLogFileURL)); + osl::File aBuildLogFile(rtl::OStringToOUString(aBuildLogFileURL, RTL_TEXTENCODING_UTF8)); osl::FileBase::RC status = aBuildLogFile.open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 23c384532034..8fa70fb230e2 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -3043,7 +3043,7 @@ void ScInterpreter::ScBahtText() if( bMinus ) aText.insert( 0, OString( UTF8_TH_MINUS ) ); - PushString( OUString::fromUtf8(aText.makeStringAndClear()) ); + PushString( OStringToOUString(aText.makeStringAndClear(), RTL_TEXTENCODING_UTF8) ); } } diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index 66ffd19f80e0..8131a5465d52 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -93,13 +93,13 @@ void ScInterpreter::ScFilterXML() xmlNsPtr ns = (xmlNsPtr)pNodeSet->nodeTab[0]; xmlNodePtr cur = (xmlNodePtr)ns->next; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); - aResult = OUString::fromUtf8(OString((char*)pChar2.get())); + aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } else { xmlNodePtr cur = pNodeSet->nodeTab[0]; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); - aResult = OUString::fromUtf8(OString((char*)pChar2.get())); + aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } } else @@ -198,7 +198,7 @@ void ScInterpreter::ScWebservice() xStream->closeInput(); - OUString aContent = OUString::fromUtf8( aBuffer.makeStringAndClear() ); + OUString aContent = OStringToOUString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); PushString( aContent ); } } diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 288e9d3ad42f..d0d3c37d3106 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -1891,7 +1891,7 @@ void NumberFormat::setFormatCode( const OUString& rFmtCode ) void NumberFormat::setFormatCode( const Locale& rLocale, const sal_Char* pcFmtCode ) { maModel.maLocale = rLocale; - maModel.maFmtCode = OUString::fromUtf8( OString( pcFmtCode ) ); + maModel.maFmtCode = OStringToOUString( OString( pcFmtCode ), RTL_TEXTENCODING_UTF8 ); maModel.mnPredefId = -1; } diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index e688a0f293fb..3735f28c82b2 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -432,7 +432,7 @@ void ScOrcusSharedStrings::append_segment(const char* s, size_t n) size_t ScOrcusSharedStrings::commit_segments() { OString aStr = maCurSegment.makeStringAndClear(); - return mrFactory.addString(OUString::fromUtf8(aStr)); + return mrFactory.addString(OStringToOUString(aStr, RTL_TEXTENCODING_UTF8)); } void ScOrcusStyles::set_font_count(size_t /*n*/) diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 23cb845e5fcc..c6782d1a25a2 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -35,7 +35,8 @@ ScMetricInputDlg::ScMetricInputDlg( vcl::Window* pParent, long nLast ) : ModalDialog(pParent, sDialogName, - OUString::fromUtf8("modules/scalc/ui/" + sDialogName.toAsciiLowerCase() + ".ui")) + OStringToOUString("modules/scalc/ui/" + + sDialogName.toAsciiLowerCase() + ".ui", RTL_TEXTENCODING_UTF8)) { get(m_pEdValue, "value"); get(m_pBtnDefVal, "default"); -- cgit