diff options
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/core/opencl/openclwrapper.cxx | 6 | ||||
-rw-r--r-- | sc/source/core/tool/interpr2.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/interpr7.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/oox/numberformatsbuffer.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/orcus/interface.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/mtrindlg.cxx | 3 |
6 files changed, 10 insertions, 11 deletions
diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 23db69e7740e..7e54cfcf605f 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -154,7 +154,7 @@ std::vector<boost::shared_ptr<osl::File> > OpenCLDevice::binaryGenerated( const if ( mpArryDevsID[i] != 0 ) { OString fileName = createFileName(gpuEnv.mpArryDevsID[i], clFileName); - osl::File* pNewFile = new osl::File(rtl::OStringToOUString(fileName, RTL_TEXTENCODING_UTF8)); + osl::File* pNewFile = new osl::File(rtl::OUString::fromUtf8(fileName)); if(pNewFile->open(osl_File_OpenFlag_Read) == osl::FileBase::E_None) { aGeneratedFiles.push_back(boost::shared_ptr<osl::File>(pNewFile)); @@ -174,7 +174,7 @@ std::vector<boost::shared_ptr<osl::File> > OpenCLDevice::binaryGenerated( const bool OpenCLDevice::writeBinaryToFile( const OString& rFileName, const char* binary, size_t numBytes ) { - osl::File file(rtl::OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8)); + osl::File file(rtl::OUString::fromUtf8(rFileName)); 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::OStringToOUString(aBuildLogFileURL, RTL_TEXTENCODING_UTF8)); + osl::File aBuildLogFile(rtl::OUString::fromUtf8(aBuildLogFileURL)); 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 8fa70fb230e2..23c384532034 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( OStringToOUString(aText.makeStringAndClear(), RTL_TEXTENCODING_UTF8) ); + PushString( OUString::fromUtf8(aText.makeStringAndClear()) ); } } diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index 8131a5465d52..66ffd19f80e0 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<xmlChar> pChar2(xmlNodeGetContent(cur), xmlFree); - aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); + aResult = OUString::fromUtf8(OString((char*)pChar2.get())); } else { xmlNodePtr cur = pNodeSet->nodeTab[0]; boost::shared_ptr<xmlChar> pChar2(xmlNodeGetContent(cur), xmlFree); - aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); + aResult = OUString::fromUtf8(OString((char*)pChar2.get())); } } else @@ -198,7 +198,7 @@ void ScInterpreter::ScWebservice() xStream->closeInput(); - OUString aContent = OStringToOUString( aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); + OUString aContent = OUString::fromUtf8( aBuffer.makeStringAndClear() ); PushString( aContent ); } } diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index d0d3c37d3106..288e9d3ad42f 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 = OStringToOUString( OString( pcFmtCode ), RTL_TEXTENCODING_UTF8 ); + maModel.maFmtCode = OUString::fromUtf8( OString( pcFmtCode ) ); maModel.mnPredefId = -1; } diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index 3735f28c82b2..e688a0f293fb 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(OStringToOUString(aStr, RTL_TEXTENCODING_UTF8)); + return mrFactory.addString(OUString::fromUtf8(aStr)); } 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 c6782d1a25a2..23cb845e5fcc 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -35,8 +35,7 @@ ScMetricInputDlg::ScMetricInputDlg( vcl::Window* pParent, long nLast ) : ModalDialog(pParent, sDialogName, - OStringToOUString("modules/scalc/ui/" + - sDialogName.toAsciiLowerCase() + ".ui", RTL_TEXTENCODING_UTF8)) + OUString::fromUtf8("modules/scalc/ui/" + sDialogName.toAsciiLowerCase() + ".ui")) { get(m_pEdValue, "value"); get(m_pBtnDefVal, "default"); |