diff options
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 2 | ||||
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 3 | ||||
-rw-r--r-- | svtools/source/control/headbar.cxx | 4 | ||||
-rw-r--r-- | svtools/source/control/tabbar.cxx | 4 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/wizard/unowizard.cxx | 3 |
6 files changed, 8 insertions, 10 deletions
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 974ac7a20079..509fea1fe4c8 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -279,7 +279,7 @@ public: inline NameTranslationEntry::NameTranslationEntry( const OString& rOrg, const OString& rTrans ) : HashedEntry(OStringToOUString(rOrg, RTL_TEXTENCODING_ASCII_US)) - , maTranslatedName(OStringToOUString(rTrans, RTL_TEXTENCODING_UTF8)) + , maTranslatedName(OUString::fromUtf8(rTrans)) { } diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index c83db0b4a1d5..191d06c943e0 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1018,8 +1018,7 @@ void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico OString aLine; aStream.ReadLine( aLine ); - OUString aEntries = OStringToOUString(aLine, - RTL_TEXTENCODING_UTF8); + OUString aEntries = OUString::fromUtf8(aLine); SetMRUEntries( aEntries, cSep ); } diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 490ad89bcbf0..139b8f81f9ff 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -1145,7 +1145,7 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + OUString aHelpId( OUString::fromUtf8( GetHelpId( nItemId ) ) ); if ( !aHelpId.isEmpty() ) { // display it if help is available @@ -1473,7 +1473,7 @@ OUString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OUString::fromUtf8( pItem->maHelpId ), this ); } return pItem->maHelpText; diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 2e8fa764f6b8..15740f92df69 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1509,7 +1509,7 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + OUString aHelpId( OUString::fromUtf8( GetHelpId( nItemId ) ) ); if ( !aHelpId.isEmpty() ) { // trigger Help if available @@ -2429,7 +2429,7 @@ OUString TabBar::GetHelpText( sal_uInt16 nPageId ) const { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OUString::fromUtf8( pItem->maHelpId ), this ); } return pItem->maHelpText; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 7bf8f637dfba..add32b0ece53 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -2119,7 +2119,7 @@ bool TransferableDataHelper::GetFileList( while( xStm->ReadLine( aDiskString ) ) if( !aDiskString.isEmpty() && aDiskString[0] != '#' ) - rFileList.AppendFile( OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) ); + rFileList.AppendFile( OUString::fromUtf8(aDiskString) ); bRet = true; } diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index c36ccbc33cf3..c37a71774abd 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -258,8 +258,7 @@ namespace { static OUString lcl_getHelpURL( const OString& sHelpId ) { OUStringBuffer aBuffer; - OUString aTmp( - OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ); + OUString aTmp( OUString::fromUtf8( sHelpId ) ); INetURLObject aHID( aTmp ); if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) aBuffer.appendAscii( INET_HID_SCHEME ); |