From 05050cdb23de586870bf479a9df5ced06828d498 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 6 Nov 2014 07:45:00 +0200 Subject: use the new OUString::fromUtf8 method Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77 --- sd/source/filter/html/htmlex.cxx | 2 +- sd/source/filter/ppt/pptin.cxx | 2 +- sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4 ++-- sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 +- sd/source/ui/remotecontrol/Server.cxx | 5 ++--- 5 files changed, 7 insertions(+), 8 deletions(-) (limited to 'sd') diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 897f26851024..d5d355276f0f 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1084,7 +1084,7 @@ OUString HtmlExport::DocumentMetadata() const OString aData(reinterpret_cast(aStream.GetData()), aStream.GetSize()); - return OStringToOUString(aData, RTL_TEXTENCODING_UTF8); + return OUString::fromUtf8(aData); } bool HtmlExport::CreateHtmlTextForPresPages() diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 0429ecfbe769..506af5bb0c16 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -443,7 +443,7 @@ bool ImplSdPPTImport::Import() { // second pass, searching for a SlideName for ( nToken = 0; nToken < nTokenCount; nToken++ ) { - OUString aToken(OStringToOUString(aStringAry[nToken], RTL_TEXTENCODING_UTF8)); + OUString aToken(OUString::fromUtf8(aStringAry[nToken])); std::vector::const_iterator pIter = std::find(maSlideNameList.begin(),maSlideNameList.end(),aToken); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 6a68229968fc..46e0d4a369a2 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -627,7 +627,7 @@ vcl::Window * lcl_GetTopmostParent( vcl::Window * pWindow ) void CustomAnimationCreateDialog::setPosition() { - SvtViewOptions aDlgOpt(E_TABDIALOG, OStringToOUString(GetHelpId(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(E_TABDIALOG, OUString::fromUtf8(GetHelpId())); if ( aDlgOpt.Exists() ) { SetWindowState( OUStringToOString(aDlgOpt.GetWindowState(), @@ -654,7 +654,7 @@ void CustomAnimationCreateDialog::setPosition() void CustomAnimationCreateDialog::storePosition() { // save settings (screen position and current page) - SvtViewOptions aDlgOpt(E_TABDIALOG, OStringToOUString(GetHelpId(), RTL_TEXTENCODING_UTF8)); + SvtViewOptions aDlgOpt(E_TABDIALOG, OUString::fromUtf8(GetHelpId())); aDlgOpt.SetWindowState(OStringToOUString( GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US)); } diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index d5bf9663a97c..e3c336f5f6a1 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -492,7 +492,7 @@ sal_Int32 OSXBluetoothWrapper::readLine( OString& aLine ) mBuffer.erase( mBuffer.begin(), aIt + 1 ); // Also delete the empty line // yeps - SAL_INFO( "sdremote.bluetooth", " returning, got \"" << OStringToOUString( aLine, RTL_TEXTENCODING_UTF8 ) << "\"" ); + SAL_INFO( "sdremote.bluetooth", " returning, got \"" << OUString::fromUtf8( aLine ) << "\"" ); return aLine.getLength() + 1; } diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 7404bbddcfbf..07321bad6e94 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -131,9 +131,8 @@ void RemoteServer::execute() MutexGuard aGuard( sDataMutex ); ::boost::shared_ptr< ClientInfoInternal > pClient( new ClientInfoInternal( - OStringToOUString( aName, RTL_TEXTENCODING_UTF8 ), - aAddress, false, pSocket, OStringToOUString( aPin, - RTL_TEXTENCODING_UTF8 ) ) ); + OUString::fromUtf8( aName ), + aAddress, false, pSocket, OUString::fromUtf8( aPin ) ) ); mAvailableClients.push_back( pClient ); // Read off any additional non-empty lines -- cgit 6.1'>distro/collabora/lov-6.1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/icon-themes/karasa_jaga_svg/starmath/res
AgeCommit message (Expand)Author
2019-06-10 tdf#125368, KJ: vcl, radio; elementary: res, snaprizmut