diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-09 12:02:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:04 +0200 |
| commit | 6b25dd2f914a7bdd4d39e21675fcedd049192b73 (patch) | |
| tree | df621ce971c31da7916392d40458a5c858130b54 /sw/source/ui/utlui | |
| parent | 3acd7ab515ab6e97c9110b89d13136d94be5eef6 (diff) | |
convert sw/source/ui/inc/c*.hxx from String to OUString
Change-Id: I8b8c73a0ba9b1e40549c1832ed6ad5b630d4e620
Diffstat (limited to 'sw/source/ui/utlui')
| -rw-r--r-- | sw/source/ui/utlui/glbltree.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 438e8627bdaa..557e09a58e4f 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -206,7 +206,7 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { TransferableDataHelper aData( rEvt.maDropEvent.Transferable ); - String sFileName; + OUString sFileName; const SwGlblDocContent* pCnt = pDropEntry ? (const SwGlblDocContent*)pDropEntry->GetUserData() : 0; @@ -243,8 +243,8 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) } delete pTempContents; } - else if( 0 != (sFileName = - SwNavigationPI::CreateDropFileName( aData )).Len()) + else if( !(sFileName = + SwNavigationPI::CreateDropFileName( aData )).isEmpty()) { INetURLObject aTemp(sFileName); GraphicDescriptor aDesc(aTemp); @@ -704,7 +704,7 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData) } } -void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pFileName ) +void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const OUString* pFileName ) { Sequence< OUString > aFileNames; if ( !pFileName ) @@ -716,7 +716,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* pCont, const String* pF OUString("swriter"), true ); pDocInserter->StartExecuteModal( LINK( this, SwGlobalTree, DialogClosedHdl ) ); } - else if ( pFileName->Len() ) + else if ( !pFileName->isEmpty() ) { aFileNames.realloc(1); INetURLObject aFileName; @@ -929,10 +929,10 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry SID_SAVEASDOC, SFX_CALLMODE_SYNCHRON ); SfxObjectShell& rObj = *pFrame->GetObjectShell(); const SfxMedium* pMedium = rObj.GetMedium(); - String sNewFile(pMedium->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI)); + OUString sNewFile(pMedium->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI)); // Insert the area with the Doc-Name // Bring the own Doc in the foreground - if(aFrmListener.IsValid() && sNewFile.Len()) + if(aFrmListener.IsValid() && !sNewFile.isEmpty()) { pGlobFrm->ToTop(); // Due to the update the entries are invalid |