diff options
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 5 |
3 files changed, 5 insertions, 6 deletions
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 |