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 /cui | |
parent | a067546dec428f8d467aa498bf0fd3968582e7eb (diff) |
convert include/svtools/insdlg.hxx from String to OUString
Change-Id: I72c5e3e47040e78976f46f585b50ab6c12f84986
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/pastedlg.cxx | 22 | ||||
-rw-r--r-- | cui/source/inc/pastedlg.hxx | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 795dae49cb1b..3b4ffb73cb82 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -102,7 +102,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, pFormats = &rHelper.GetDataFlavorExVector(); // create and fill dialog box - String aSourceName, aTypeName; + OUString aSourceName, aTypeName; sal_uLong nSelFormat = 0; SvGlobalName aEmptyNm; @@ -115,19 +115,19 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, ::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter ); SotFormatStringId nFormat = (*aIter++).mnSotId; - ::std::map< SotFormatStringId, String >::iterator itName = + ::std::map< SotFormatStringId, OUString >::iterator itName = aSupplementMap.find( nFormat ); // if there is an "Embed Source" or and "Embedded Object" on the // Clipboard we read the Description and the Source of this object // from an accompanied "Object Descriptor" format on the clipboard // Remember: these formats mostly appear together on the clipboard - String aName; - const String* pName = NULL; + OUString aName; + const OUString* pName = NULL; if ( itName == aSupplementMap.end() ) { SvPasteObjectHelper::GetEmbeddedName(rHelper,aName,aSourceName,nFormat); - if ( aName.Len() ) + if ( !aName.isEmpty() ) pName = &aName; } else @@ -155,7 +155,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, { continue; } - else if( !aName.Len() ) + else if( aName.isEmpty() ) aName = SvPasteObjectHelper::GetSotFormatUIName( nFormat ); if( LISTBOX_ENTRY_NOTFOUND == ObjectLB().GetEntryPos( aName ) ) @@ -164,7 +164,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, } } - if( !aTypeName.Len() && !aSourceName.Len() ) + if( aTypeName.isEmpty() && aSourceName.isEmpty() ) { if( aDesc.maClassName != aEmptyNm ) { @@ -172,7 +172,7 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, aTypeName = aDesc.maTypeName; } - if( !aTypeName.Len() && !aSourceName.Len() ) + if( aTypeName.isEmpty() && aSourceName.isEmpty() ) { ResMgr* pMgr = ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() ); // global resource from svtools (former so3 resource) @@ -185,10 +185,10 @@ sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, ObjectLB().SetUpdateMode( sal_True ); SelectObject(); - if( aSourceName.Len() ) + if( !aSourceName.isEmpty() ) { - if( aTypeName.Len() ) - aTypeName += '\n'; + if( !aTypeName.isEmpty() ) + aTypeName += "\n"; aTypeName += aSourceName; aTypeName = convertLineEnd(aTypeName, GetSystemLineEnd()); diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 30be129e9faa..7cd13f620eab 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -42,7 +42,7 @@ class SvPasteObjectDialog : public ModalDialog FixedText* m_pFtObjectSource; ListBox* m_pLbInsertList; OKButton* m_pOKButton; - ::std::map< SotFormatStringId, String > aSupplementMap; + ::std::map< SotFormatStringId, OUString > aSupplementMap; SvGlobalName aObjClassName; String aObjName; |