convert include/svtools/transfer.hxx from String to OUString

Change-Id: Ie80c29a73db295ccc8fe975f8fe7027b9a1eb79a

15 files changed, 71 insertions, 99 deletions

diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 791f7c9e6460..773b82136349 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -88,7 +88,7 @@ sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
 sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
     TransferableDataHelper  aDataHelper( rEvt.maDropEvent.Transferable );
-    String                  aString;
+    OUString                aString;
     sal_Int8                nRet = DND_ACTION_NONE;
 
     if( aDataHelper.GetString( FORMAT_STRING, aString ) )
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 54a2dcf17793..f85732638cfa 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -316,9 +316,6 @@ public:
     ::com::sun::star::uno::Any  GetAny( SotFormatStringId nFormat ) const;
     ::com::sun::star::uno::Any  GetAny( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const;
 
-    sal_Bool                    GetString( SotFormatStringId nFormat, String& rStr );
-    sal_Bool                    GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, String& rStr );
-
     sal_Bool                    GetString( SotFormatStringId nFormat, OUString& rStr );
     sal_Bool                    GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, OUString& rStr );
 
@@ -501,8 +498,8 @@ public:
     void                CopyINetImage( const INetImage& rINtImg );
     void                CopyImageMap( const ImageMap& rImgMap );
     void                CopyGraphic( const Graphic& rGrf );
-    void                CopyString( const String& rStr );
-    void                CopyString( sal_uInt16 nFmt, const String& rStr );
+    void                CopyString( const OUString& rStr );
+    void                CopyString( sal_uInt16 nFmt, const OUString& rStr );
     void                CopyAny( sal_uInt16 nFmt, const ::com::sun::star::uno::Any& rAny );
 
     void                CopyByteString( sal_uLong nFormatId, const OString& rStr );
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 1712e5662d62..4c767df789fa 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -125,7 +125,6 @@ public:
     void    SetPos( long nNewPos) { nPos = nNewPos; }
     long    GetPos() const { return nPos; }
     long    CalcOffset( long nItemLength, long nTabWidth );
-    // long CalcOffset( const String&, const OutputDevice& );
     sal_Bool    IsEditable() const { return (sal_Bool)((nFlags & SV_LBOXTAB_EDITABLE)!=0); }
     sal_Bool    IsPushable() const { return (sal_Bool)((nFlags & SV_LBOXTAB_PUSHABLE)!=0); }
 };
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 200a3fd658bf..c6b810bd8499 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -583,7 +583,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
     }
     else if ( nFormatId == SOT_FORMAT_FILE )
     {
-        String aFile;
+        OUString aFile;
         if ( aDataHelper.GetString( nFormatId, aFile ) )
             bRet = PasteFile( aPos, aFile, bLink );
     }
@@ -638,21 +638,21 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r
     sal_uInt16 nRows = 1;
     if ( aDataHelper.HasFormat( SOT_FORMAT_STRING ) )
     {
-        String aDataStr;
+        OUString aDataStr;
         if ( aDataHelper.GetString( SOT_FORMAT_STRING, aDataStr ) )
         {
             //  get size from string the same way as in ScDdeLink::DataChanged
 
             aDataStr = convertLineEnd(aDataStr, LINEEND_LF);
-            xub_StrLen nLen = aDataStr.Len();
-            if (nLen && aDataStr.GetChar(nLen-1) == '\n')
-                aDataStr.Erase(nLen-1);
+            sal_Int32 nLen = aDataStr.getLength();
+            if (nLen && aDataStr[nLen-1] == '\n')
+                aDataStr = aDataStr.copy(0, nLen-1);
 
-            if (aDataStr.Len())
+            if (!aDataStr.isEmpty())
             {
                 nRows = comphelper::string::getTokenCount(aDataStr, '\n');
-                String aLine = aDataStr.GetToken( 0, '\n' );
-                if (aLine.Len())
+                OUString aLine = aDataStr.getToken( 0, '\n' );
+                if (!aLine.isEmpty())
                     nCols = comphelper::string::getTokenCount(aLine, '\t');
             }
         }
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index f769db33e8f8..af3c6d27e966 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1072,7 +1072,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
             if( pNavWin && ( pNavWin == mpParent ) )
             {
                 TransferableDataHelper  aDataHelper( rEvt.maDropEvent.Transferable );
-                String                  aFile;
+                OUString                aFile;
 
                 if( aDataHelper.GetString( FORMAT_FILE, aFile ) &&
                     ( (SdNavigatorWin*) mpParent)->InsertFile( aFile ) )
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index cbdb81a99a5f..5d373836e50a 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -87,7 +87,7 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr
             }
 
             // then, if necessary, the file format
-            String aFilePath;
+            OUString aFilePath;
             if ( !bFormatFound && aHelper.GetString( SOT_FORMAT_FILE, aFilePath ) )
                 implts_OpenFile( aFilePath );
         }
diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx
index eba7a5697c0e..579a9998d2e7 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.cxx
@@ -78,7 +78,7 @@ namespace svt
         {
             if (SOT_FORMAT_STRING == aSearch->mnSotId)
             {
-                String sContent;
+                OUString sContent;
                 sal_Bool bSuccess = aClipboardData.GetString( SOT_FORMAT_STRING, sContent );
                 _rContent = sContent;
                 return bSuccess;
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index a2ff668f2d96..72e30154ea09 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -845,7 +845,7 @@ sal_Bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::su
     SvMemoryStream aMemStm( 8192, 8192 );
 
     aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
-    rIMap.Write( aMemStm, String() );
+    rIMap.Write( aMemStm, OUString() );
     maAny <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) );
 
     return( maAny.hasValue() );
@@ -943,8 +943,8 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
 
         case SOT_FORMATSTR_ID_FILECONTENT:
         {
-            String aStr( RTL_CONSTASCII_USTRINGPARAM( "[InternetShortcut]\x0aURL=" ) );
-            maAny <<= OUString( aStr += rBmk.GetURL() );
+            OUString aStr( "[InternetShortcut]\x0aURL=" );
+            maAny <<= ( aStr += rBmk.GetURL() );
         }
         break;
 #endif
@@ -975,7 +975,7 @@ sal_Bool TransferableHelper::SetINetImage( const INetImage& rINtImg,
 
 sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const DataFlavor& rFlavor )
 {
-    SotStorageStreamRef xStm( new SotStorageStream( String() ) );
+    SotStorageStreamRef xStm( new SotStorageStream( OUString() ) );
 
     xStm->SetVersion( SOFFICE_FILEFORMAT_50 );
 
@@ -1623,30 +1623,6 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const
 
 // -----------------------------------------------------------------------------
 
-sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, String& rStr )
-{
-    OUString aOUString;
-    sal_Bool        bRet = GetString( nFormat, aOUString );
-
-    rStr = aOUString;
-
-    return bRet;
-}
-
-// -----------------------------------------------------------------------------
-
-sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, String& rStr )
-{
-    OUString aOUString;
-    sal_Bool        bRet = GetString( rFlavor, aOUString );
-
-    rStr = aOUString;
-
-    return bRet;
-}
-
-// -----------------------------------------------------------------------------
-
 sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& rStr )
 {
     DataFlavor aFlavor;
@@ -1932,7 +1908,7 @@ sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransf
 
     if( bRet )
     {
-        rIMap.Read( *xStm, String() );
+        rIMap.Read( *xStm, OUString() );
         bRet = ( xStm->GetError() == ERRCODE_NONE );
     }
 
@@ -1976,7 +1952,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
         case( SOT_FORMATSTR_ID_SOLK ):
         case( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ):
         {
-            String aString;
+            OUString aString;
             if( GetString( rFlavor, aString ) )
             {
                 if( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR == nFormat )
@@ -1986,32 +1962,32 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
                 }
                 else
                 {
-                    String      aURL, aDesc;
-                    sal_uInt16  nStart = aString.Search( '@' ), nLen = (sal_uInt16) aString.ToInt32();
+                    OUString    aURL, aDesc;
+                    sal_Int32   nStart = aString.indexOf( '@' ), nLen = aString.toInt32();
 
-                    if( !nLen && aString.GetChar( 0 ) != '0' )
+                    if( !nLen && aString[ 0 ] != '0' )
                     {
                         DBG_WARNING( "SOLK: 1. len=0" );
                     }
-                    if( nStart == STRING_NOTFOUND || nLen > aString.Len() - nStart - 3 )
+                    if( nStart == -1 || nLen > aString.getLength() - nStart - 3 )
                     {
                         DBG_WARNING( "SOLK: 1. illegal start or wrong len" );
                     }
-                    aURL = aString.Copy( nStart + 1, nLen );
+                    aURL = aString.copy( nStart + 1, nLen );
 
-                    aString.Erase( 0, nStart + 1 + nLen );
-                    nStart = aString.Search( '@' );
-                    nLen = (sal_uInt16) aString.ToInt32();
+                    aString = aString.replaceAt( 0, nStart + 1 + nLen, "" );
+                    nStart = aString.indexOf( '@' );
+                    nLen = aString.toInt32();
 
-                    if( !nLen && aString.GetChar( 0 ) != '0' )
+                    if( !nLen && aString[ 0 ] != '0' )
                     {
                         DBG_WARNING( "SOLK: 2. len=0" );
                     }
-                    if( nStart == STRING_NOTFOUND || nLen > aString.Len() - nStart - 1 )
+                    if( nStart == -1 || nLen > aString.getLength() - nStart - 1 )
                     {
                         DBG_WARNING( "SOLK: 2. illegal start or wrong len" );
                     }
-                    aDesc = aString.Copy( nStart+1, nLen );
+                    aDesc = aString.copy( nStart+1, nLen );
 
                     rBmk = INetBookmark( aURL, aDesc );
                     bRet = sal_True;
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 5fc1d14ab3f6..4da84002652c 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -520,7 +520,7 @@ void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap )
 {
     SvMemoryStream aMemStm( 8192, 8192 );
     aMemStm.SetVersion( SOFFICE_FILEFORMAT_50 );
-    rImgMap.Write( aMemStm, String() );
+    rImgMap.Write( aMemStm, OUString() );
     CopyAnyData( SOT_FORMATSTR_ID_SVIM, (sal_Char*)aMemStm.GetData(),
                     aMemStm.Seek( STREAM_SEEK_TO_END ) );
 }
@@ -547,9 +547,9 @@ void TransferDataContainer::CopyGraphic( const Graphic& rGrf )
 
 // -----------------------------------------------------------------------------
 
-void TransferDataContainer::CopyString( sal_uInt16 nFmt, const String& rStr )
+void TransferDataContainer::CopyString( sal_uInt16 nFmt, const OUString& rStr )
 {
-    if( rStr.Len() )
+    if( !rStr.isEmpty() )
     {
         TDataCntnrEntry_Impl aEntry;
         aEntry.nId = nFmt;
@@ -562,7 +562,7 @@ void TransferDataContainer::CopyString( sal_uInt16 nFmt, const String& rStr )
 
 // -----------------------------------------------------------------------------
 
-void TransferDataContainer::CopyString( const String& rStr )
+void TransferDataContainer::CopyString( const OUString& rStr )
 {
     CopyString( SOT_FORMAT_STRING, rStr );
 }
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 129a3657450f..b2683522a304 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -346,14 +346,14 @@ namespace svx
         if (!nRecognizedFormat)
             return sal_False;
 
-        String sFieldDescription;
+        OUString sFieldDescription;
         const_cast<TransferableDataHelper&>(_rData).GetString(nRecognizedFormat, sFieldDescription);
 
         const sal_Unicode cSeparator = sal_Unicode(11);
-        _rDatasource    = sFieldDescription.GetToken(0, cSeparator);
-        _rCommand       = sFieldDescription.GetToken(1, cSeparator);
-        _nCommandType   = sFieldDescription.GetToken(2, cSeparator).ToInt32();
-        _rFieldName     = sFieldDescription.GetToken(3, cSeparator);
+        _rDatasource    = sFieldDescription.getToken(0, cSeparator);
+        _rCommand       = sFieldDescription.getToken(1, cSeparator);
+        _nCommandType   = sFieldDescription.getToken(2, cSeparator).toInt32();
+        _rFieldName     = sFieldDescription.getToken(3, cSeparator);
 
         return sal_True;
     }
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index b44df0206c4f..3311fe9be011 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1261,11 +1261,11 @@ sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::X
                 aDataHelper.GetFileList( SOT_FORMAT_FILE_LIST, aFileList );
             else
             {
-                String aFile;
+                OUString aFile;
 
                 aDataHelper.GetString( FORMAT_FILE, aFile );
 
-                if( aFile.Len() )
+                if( !aFile.isEmpty() )
                     aFileList.AppendFile( aFile );
             }
 
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index b92f5e059715..ef9f0a16b7c2 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1417,13 +1417,13 @@ int SwTransferable::PasteData( TransferableDataHelper& rData,
 
         case EXCHG_OUT_ACTION_INSERT_HYPERLINK:
             {
-                String sURL, sDesc;
+                OUString sURL, sDesc;
                 if( SOT_FORMAT_FILE == nFormat )
                 {
-                    if( rData.GetString( nFormat, sURL ) && sURL.Len() )
+                    if( rData.GetString( nFormat, sURL ) && !sURL.isEmpty() )
                     {
                         SwTransferable::_CheckForURLOrLNKFile( rData, sURL, &sDesc );
-                        if( !sDesc.Len() )
+                        if( sDesc.isEmpty() )
                             sDesc = sURL;
                         nRet = 1;
                     }
@@ -1911,7 +1911,7 @@ int SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
     {
         if( aINetImg.GetImageURL().Len() && bInsertGRF )
         {
-            String sURL( aINetImg.GetImageURL() );
+            OUString sURL( aINetImg.GetImageURL() );
             SwTransferable::_CheckForURLOrLNKFile( rData, sURL );
 
             //!!! check at FileSystem - only then it make sense to test graphics !!!
@@ -2106,7 +2106,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
 
     SwDDEFieldType* pDDETyp = (SwDDEFieldType*)pTyp;
 
-    String aExpand;
+    OUString aExpand;
     if( rData.GetString( FORMAT_STRING, aExpand ))
     {
         do {            // middle checked loop
@@ -2114,7 +2114,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
             // When data comes from a spreadsheet, we add a DDE-table
             if( ( rData.HasFormat( SOT_FORMATSTR_ID_SYLK ) ||
                   rData.HasFormat( SOT_FORMATSTR_ID_SYLK_BIGCAPS ) ) &&
-                aExpand.Len() &&
+                !aExpand.isEmpty() &&
                  ( 1 < comphelper::string::getTokenCount(aExpand, '\n') ||
                        comphelper::string::getTokenCount(aExpand, '\t') ) )
             {
@@ -2248,10 +2248,10 @@ int SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
 
     case SOT_FORMAT_FILE:
         {
-            String sTxt;
+            OUString sTxt;
             if( 0 != ( nRet = rData.GetString( nFmt, sTxt ) ) )
             {
-                String sDesc;
+                OUString sDesc;
                 SwTransferable::_CheckForURLOrLNKFile( rData, sTxt, &sDesc );
 
                 aBkmk = INetBookmark(
@@ -2417,10 +2417,10 @@ int SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
                                         SwWrtShell& rSh, sal_uLong nFmt )
 {
     int nRet = 0;
-    String sFile;
-    if( rData.GetString( nFmt, sFile ) && sFile.Len() )
+    OUString sFile;
+    if( rData.GetString( nFmt, sFile ) && !sFile.isEmpty() )
     {
-        String sDesc;
+        OUString sDesc;
         SwTransferable::_CheckForURLOrLNKFile( rData, sFile, &sDesc );
 
         // first, make the URL absolute
@@ -2449,7 +2449,7 @@ int SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
         default:
             {
                 rSh.InsertURL( SwFmtINetFmt( sFile, OUString() ),
-                                sDesc.Len() ? sDesc : sFile );
+                                sDesc.isEmpty() ? sFile : sDesc);
             }
         }
         nRet = sal_True;
@@ -2468,8 +2468,8 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData,
         nRet |= SWTRANSFER_GRAPHIC_INSERTED;
     if( !nRet )
     {
-        String sFile, sDesc;
-        if( rData.GetString( nFmt, sFile ) && sFile.Len() )
+        OUString sFile, sDesc;
+        if( rData.GetString( nFmt, sFile ) && !sFile.isEmpty() )
         {
             INetURLObject aMediaURL;
 
@@ -2536,7 +2536,7 @@ int SwTransferable::_PasteFileName( TransferableDataHelper& rData,
                     default:
                         {
                             rSh.InsertURL( SwFmtINetFmt( sFile, OUString() ),
-                                            sDesc.Len() ? sDesc : sFile );
+                                            sDesc.isEmpty() ? sFile : sDesc );
                         }
                     }
                     nRet = sal_True;
@@ -2552,8 +2552,8 @@ int SwTransferable::_PasteDBData( TransferableDataHelper& rData,
                                     const Point* pDragPt, sal_Bool bMsg )
 {
     int nRet = 0;
-    String sTxt;
-    if( rData.GetString( nFmt, sTxt ) && sTxt.Len() )
+    OUString sTxt;
+    if( rData.GetString( nFmt, sTxt ) && !sTxt.isEmpty() )
     {
         sal_uInt16 nWh = SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE == nFmt
                     ? 0
@@ -2690,7 +2690,7 @@ int SwTransferable::_PasteFileList( TransferableDataHelper& rData,
 }
 
 sal_Bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
-                                        String& rFileName, String* pTitle )
+                                        OUString& rFileName, OUString* pTitle )
 {
     sal_Bool bIsURLFile = sal_False;
     INetBookmark aBkmk;
@@ -2703,10 +2703,10 @@ sal_Bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
     }
     else
     {
-        xub_StrLen nLen = rFileName.Len();
-        if( 4 < nLen && '.' == rFileName.GetChar( nLen - 4 ))
+        sal_Int32 nLen = rFileName.getLength();
+        if( 4 < nLen && '.' == rFileName[ nLen - 4 ])
         {
-            String sExt( rFileName.Copy( nLen - 3 ));
+            String sExt( rFileName.copy( nLen - 3 ));
             if( sExt.EqualsIgnoreCaseAscii( "url" ))
             {
                 OSL_ENSURE( !&rFileName, "how do we read today .URL - Files?" );
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx
index ad9d369d5128..89ea0ad53d55 100644
--- a/sw/source/ui/inc/swdtflvr.hxx
+++ b/sw/source/ui/inc/swdtflvr.hxx
@@ -85,7 +85,7 @@ class SwTransferable : public TransferableHelper
     static SwTransferable* GetSwTransferable( const TransferableDataHelper& rData );
     static void SetSelInShell( SwWrtShell& , sal_Bool , const Point* );
     static sal_Bool _CheckForURLOrLNKFile( TransferableDataHelper& rData,
-                                String& rFileName, String* pTitle = 0 );
+                                OUString& rFileName, OUString* pTitle = 0 );
     static int _TestAllowedFormat( const TransferableDataHelper& rData,
                                         sal_uLong nFormat, sal_uInt16 nDestination );
 
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 5b54d0eff077..5f5f10960413 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -3048,15 +3048,15 @@ void NaviContentBookmark::Copy( TransferDataContainer& rData ) const
 
 sal_Bool NaviContentBookmark::Paste( TransferableDataHelper& rData )
 {
-    String sStr;
+    OUString sStr;
     sal_Bool bRet = rData.GetString( SOT_FORMATSTR_ID_SONLK, sStr );
     if( bRet )
     {
         sal_Int32 nPos = 0;
-        aUrl    = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos );
-        aDescr  = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos );
-        nDefDrag= (sal_uInt16)sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32();
-        nDocSh  = sStr.GetToken(0, NAVI_BOOKMARK_DELIM, nPos ).ToInt32();
+        aUrl    = sStr.getToken(0, NAVI_BOOKMARK_DELIM, nPos );
+        aDescr  = sStr.getToken(0, NAVI_BOOKMARK_DELIM, nPos );
+        nDefDrag= (sal_uInt16)sStr.getToken(0, NAVI_BOOKMARK_DELIM, nPos ).toInt32();
+        nDocSh  = sStr.getToken(0, NAVI_BOOKMARK_DELIM, nPos ).toInt32();
     }
     return bRet;
 }
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 5c6bea7fa967..a681f8cfcd9f 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -1141,7 +1141,7 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
 
 String SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
 {
-    String sFileName;
+    OUString sFileName;
     sal_uLong nFmt;
     if( rData.HasFormat( nFmt = FORMAT_FILE_LIST ))
     {
@@ -1163,7 +1163,7 @@ String SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
         rData.GetINetBookmark( nFmt, aBkmk );
         sFileName = aBkmk.GetURL();
     }
-    if( sFileName.Len() )
+    if( !sFileName.isEmpty() )
     {
         sFileName = INetURLObject( sFileName ).GetMainURL( INetURLObject::NO_DECODE );
     }