diff options
author | Noel Grandin <noel@peralex.com> | 2013-08-14 17:19:45 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-08-15 09:11:36 +0200 |
commit | 3994dd5e347d140c4fa7d6f962b2e4089f1c6153 (patch) | |
tree | eeb729601e3f10699e616bff71342412b21a788f /svtools/source/dialogs | |
parent | a067546dec428f8d467aa498bf0fd3968582e7eb (diff) |
convert include/svtools/insdlg.hxx from String to OUString
Change-Id: I72c5e3e47040e78976f46f585b50ab6c12f84986
Diffstat (limited to 'svtools/source/dialogs')
-rw-r--r-- | svtools/source/dialogs/insdlg.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 795a58933241..2490b0751db8 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -55,7 +55,7 @@ struct OleObjectDescriptor /********************** SvObjectServerList ******************************** **************************************************************************/ -const SvObjectServer * SvObjectServerList::Get( const String & rHumanName ) const +const SvObjectServer * SvObjectServerList::Get( const OUString & rHumanName ) const { for( size_t i = 0; i < aObjectServerList.size(); i++ ) { @@ -189,7 +189,7 @@ void SvObjectServerList::FillInsertObjects() } } -String SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId ) +OUString SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId ) { struct SotResourcePair { @@ -284,7 +284,7 @@ String SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId ) return aUIName; } // ----------------------------------------------------------------------------- -sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData,String& _rName,String& _rSource,SotFormatStringId& _nFormat) +sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat) { sal_Bool bRet = sal_False; if( _nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || _nFormat == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ) @@ -314,7 +314,7 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat reinterpret_cast< sal_Char* >( pOleObjDescr ) + pOleObjDescr->dwFullUserTypeName ); - _rName.Append( pUserTypeName ); + _rName += pUserTypeName; // the following statement was here for historical reasons, it is commented out since it causes bug i49460 // _nFormat = SOT_FORMATSTR_ID_EMBED_SOURCE_OLE; } @@ -331,7 +331,7 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat reinterpret_cast< sal_Char* >( pOleObjDescr ) + pOleObjDescr->dwSrcOfCopy ); - _rSource.Append( pSrcOfCopy ); + _rSource += pSrcOfCopy; } else _rSource = SVT_RESSTR(STR_UNKNOWN_SOURCE); |