convert include/sfx2/linkmgr.hxx from String to OUString

along the way, de-virtual ScDocFunc::InsertAreaLink, since
it only has one implementation.

Change-Id: I3fc836f9954628f154e01b1c7ae8f90eb7600a76

32 files changed, 186 insertions, 237 deletions

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 98d2560973d9..887eb90ca82a 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -197,8 +197,8 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
 
         UpdateNow().Enable();
 
-        String sType, sLink;
-        String *pLinkNm = &sLink, *pFilter = 0;
+        OUString sType, sLink;
+        OUString *pLinkNm = &sLink, *pFilter = 0;
 
         if( FILEOBJECT & pLink->GetObjType() )
         {
@@ -219,7 +219,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
                 Manual().Check();
         }
 
-        String aFileName;
+        OUString aFileName;
         pLinkMgr->GetDisplayNames( pLink, &sType, &aFileName, pLinkNm, pFilter );
         aFileName = INetURLObject::decode(aFileName, INET_HEX_ESCAPE, INetURLObject::DECODE_UNAMBIGUOUS);
         FileName().SetText( aFileName );
@@ -350,8 +350,8 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
         {
             uno::Reference<ui::dialogs::XFolderPicker2> xFolderPicker = ui::dialogs::FolderPicker::create(comphelper::getProcessComponentContext());
 
-            String sType, sFile, sLinkName;
-            String  sFilter;
+            OUString sType, sFile, sLinkName;
+            OUString sFilter;
             SvTreeListEntry* pEntry = Links().FirstSelected();
             SvBaseLink* pLink = (SvBaseLink*)pEntry->GetUserData();
             pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, 0, 0 );
@@ -379,7 +379,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
                     INetURLObject aUrl_(sFile);
                     INetURLObject aUrl2(aPath, INET_PROT_FILE);
                     aUrl2.insertName( aUrl_.getName() );
-                    String sNewLinkName;
+                    OUString sNewLinkName;
                     MakeLnkName( sNewLinkName, 0 ,
                             aUrl2.GetMainURL(INetURLObject::DECODE_TO_IURI), sLinkName, &sFilter);
                     pLink->SetLinkSourceName( sNewLinkName );
@@ -621,7 +621,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
 
 void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_Bool bSelect )
 {
-    String aEntry, sFileNm, sLinkNm, sTypeNm, sFilter;
+    OUString aEntry, sFileNm, sLinkNm, sTypeNm, sFilter;
 
     pLinkMgr->GetDisplayNames( (SvBaseLink*)&rLink, &sTypeNm, &sFileNm, &sLinkNm, &sFilter );
 
@@ -641,14 +641,14 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_
         aTxt = aFileName;
 
     aEntry = aTxt;
-    aEntry += '\t';
+    aEntry += "\t";
     if( OBJECT_CLIENT_GRF == rLink.GetObjType() )
         aEntry += sFilter;
     else
         aEntry += sLinkNm;
-    aEntry += '\t';
+    aEntry += "\t";
     aEntry += sTypeNm;
-    aEntry += '\t';
+    aEntry += "\t";
     aEntry += ImplGetStateStr( rLink );
 
     SvTreeListEntry * pE = Links().InsertEntryToColumn( aEntry, nPos );
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index 768e913ee2b4..f8ddc888d242 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -63,7 +63,7 @@ class SFX2_DLLPUBLIC LinkManager
     SfxObjectShell *pPersist; // LinkMgr must be release before SfxObjectShell
 protected:
     sal_Bool        InsertLink( SvBaseLink* pLink, sal_uInt16 nObjType, sal_uInt16 nUpdateType,
-                            const String* pName = 0 );
+                            const OUString* pName = 0 );
 public:
 
     enum LinkState
@@ -95,9 +95,9 @@ public:
 
     // the links connect to a SvLinkSource and adds to the list
     sal_Bool        InsertDDELink( SvBaseLink*,
-                        const String& rServer,
-                        const String& rTopic,
-                        const String& rItem );
+                        const OUString& rServer,
+                        const OUString& rTopic,
+                        const OUString& rItem );
 
     // if everything is already set at the link!
     sal_Bool        InsertDDELink( SvBaseLink* );
@@ -105,13 +105,9 @@ public:
     // Connect the links to a pseudo-object and add to the list
     bool InsertFileLink( sfx2::SvBaseLink&,
                         sal_uInt16 nFileType,
-                        const String& rFileNm,
-                        const String* pFilterNm = 0,
-                        const String* pRange = 0 );
-
-    bool InsertFileLink(
-        sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const OUString& rFileNm,
-        const OUString* pFilterNm = NULL, const OUString* pRange = NULL);
+                        const OUString& rFileNm,
+                        const OUString* pFilterNm = NULL,
+                        const OUString* pRange = NULL );
 
     void ReconnectDdeLink(SfxObjectShell& rServer);
 
@@ -126,14 +122,10 @@ public:
 
     // Obtain the string for the dialog
     bool GetDisplayNames( const SvBaseLink *,
-                                    String* pType,
-                                    String* pFile = 0,
-                                    String* pLink = 0,
-                                    String* pFilter = 0 ) const;
-
-    bool GetDisplayNames(
-        const SvBaseLink* pLink, OUString* pType, OUString* pFile = NULL,
-        OUString* pLinkStr = NULL, OUString* pFilter = NULL) const;
+                                    OUString* pType,
+                                    OUString* pFile = NULL,
+                                    OUString* pLink = NULL,
+                                    OUString* pFilter = NULL ) const;
 
     SvLinkSourceRef CreateObj( SvBaseLink* );
 
@@ -166,7 +158,7 @@ public:
 
     // if the mimetype says graphic/bitmap/gdimetafile then get the
     // graphic from the Any. Return says no errors
-    static sal_Bool GetGraphicFromAny( const String& rMimeType,
+    static sal_Bool GetGraphicFromAny( const OUString& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue,
                                 Graphic& rGrf );
 
@@ -182,11 +174,11 @@ const sal_Unicode cTokenSeparator = 0xFFFF;
 // create a string for the SvLinkName. For:
 // - DDE the first 3 Strings, (Server, Topic, Item)
 // - File-/Graphics-LinkNames the last 3 Strings (FileName, Region, Filter)
-SFX2_DLLPUBLIC void MakeLnkName( String& rName,
-                 const String* pType,       // Can also be null!!
-                 const String& rFile,
-                 const String& rLink,
-                 const String* pFilter = 0 );
+SFX2_DLLPUBLIC void MakeLnkName( OUString& rName,
+                 const OUString* pType,       // Can also be null!!
+                 const OUString& rFile,
+                 const OUString& rLink,
+                 const OUString* pFilter = 0 );
 
 }
 
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 15d9abad7196..1e876b67c10a 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -97,8 +97,8 @@ class ImpSdrObjTextLinkUserData : public SdrObjUserData
     friend class                ImpSdrObjTextLink;
 
     SdrTextObj*                 pObj;
-    String                      aFileName;   // Name des referenzierten Dokuments
-    String                      aFilterName; // ggf. ein Filter
+    OUString                    aFileName;   // Name des referenzierten Dokuments
+    OUString                    aFilterName; // ggf. ein Filter
     DateTime                    aFileDate0;  // Unnoetiges neuladen vermeiden
     ImpSdrObjTextLink*          pLink;
     rtl_TextEncoding            eCharSet;
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 23cba37e58b7..ad15e32ebd16 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -33,10 +33,10 @@ class SC_DLLPUBLIC ScAreaLink : public ::sfx2::SvBaseLink, public ScRefreshTimer
 {
 private:
     AreaLink_Impl*  pImpl;
-    String          aFileName;
-    String          aFilterName;
-    String          aOptions;
-    String          aSourceArea;
+    OUString        aFileName;
+    OUString        aFilterName;
+    OUString        aOptions;
+    OUString        aSourceArea;
     ScRange         aDestArea;
     bool            bAddUndo;
     bool            bInCreate;
@@ -45,9 +45,9 @@ private:
 
 public:
     TYPEINFO();
-    ScAreaLink( SfxObjectShell* pShell, const String& rFile,
-                    const String& rFilter, const String& rOpt,
-                    const String& rArea, const ScRange& rDest, sal_uLong nRefresh );
+    ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
+                    const OUString& rFilter, const OUString& rOpt,
+                    const OUString& rArea, const ScRange& rDest, sal_uLong nRefresh );
     virtual ~ScAreaLink();
 
     virtual void Closed();
@@ -56,22 +56,22 @@ public:
 
     virtual void    Edit( Window*, const Link& rEndEditHdl );
 
-    sal_Bool    Refresh( const String& rNewFile, const String& rNewFilter,
-                    const String& rNewArea, sal_uLong nNewRefresh );
+    sal_Bool    Refresh( const OUString& rNewFile, const OUString& rNewFilter,
+                    const OUString& rNewArea, sal_uLong nNewRefresh );
 
     void    SetInCreate(bool bSet)                  { bInCreate = bSet; }
     void    SetDoInsert(bool bSet)                  { bDoInsert = bSet; }
     void    SetDestArea(const ScRange& rNew);
-    void    SetSource(const String& rDoc, const String& rFlt, const String& rOpt,
-                        const String& rArea);
+    void    SetSource(const OUString& rDoc, const OUString& rFlt, const OUString& rOpt,
+                        const OUString& rArea);
 
-    bool IsEqual( const String& rFile, const String& rFilter, const String& rOpt,
-                  const String& rSource, const ScRange& rDest ) const;
+    bool IsEqual( const OUString& rFile, const OUString& rFilter, const OUString& rOpt,
+                  const OUString& rSource, const ScRange& rDest ) const;
 
-    const String&   GetFile() const         { return aFileName;     }
-    const String&   GetFilter() const       { return aFilterName;   }
-    const String&   GetOptions() const      { return aOptions;      }
-    const String&   GetSource() const       { return aSourceArea;   }
+    const OUString& GetFile() const         { return aFileName;     }
+    const OUString& GetFilter() const       { return aFilterName;   }
+    const OUString& GetOptions() const      { return aOptions;      }
+    const OUString& GetSource() const       { return aSourceArea;   }
     const ScRange&  GetDestArea() const     { return aDestArea;     }
 
     DECL_LINK( RefreshHdl, void* );
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index a239d05bbaaf..611aa2cf2940 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -570,7 +570,7 @@ bool ScDocument::LinkExternalTab( SCTAB& rTab, const OUString& aDocTab,
     {
         ScTableLink* pLink = new ScTableLink( pShell, aFileName, aFilterName, aOptions, nRefreshDelay );
         pLink->SetInCreate( true );
-        String aFilName = aFilterName;
+        OUString aFilName = aFilterName;
         GetLinkManager()->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, OUString(aFileName),
                                         &aFilName );
         pLink->Update();
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 6b40aba268a3..bc3eadd07672 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -934,7 +934,7 @@ void XclImpWebQuery::ReadWqtables( XclImpStream& rStrm )
         const sal_Unicode cSep = ';';
         OUString aQuotedPairs( "\"\"" );
         xub_StrLen nTokenCnt = ScStringUtil::GetQuotedTokenCount( aTables, aQuotedPairs, ',' );
-        maTables.Erase();
+        maTables = "";
         sal_Int32 nStringIx = 0;
         for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
         {
@@ -952,7 +952,7 @@ void XclImpWebQuery::ReadWqtables( XclImpStream& rStrm )
     }
 }
 
-void XclImpWebQuery::Apply( ScDocument& rDoc, const String& rFilterName )
+void XclImpWebQuery::Apply( ScDocument& rDoc, const OUString& rFilterName )
 {
     if( maURL.Len() && (meMode != xlWQUnknown) && rDoc.GetDocumentShell() )
     {
diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx
index 46493ba34a12..6fc628574cf1 100644
--- a/sc/source/filter/inc/xicontent.hxx
+++ b/sc/source/filter/inc/xicontent.hxx
@@ -206,7 +206,7 @@ public:
     void                ReadWqtables( XclImpStream& rStrm );
 
     /** Inserts the web query into the document. */
-    void                Apply( ScDocument& rDoc, const String& rFilterName );
+    void                Apply( ScDocument& rDoc, const OUString& rFilterName );
 
 private:
     /** Specifies the type of the web query (which ranges are imported). */
@@ -219,7 +219,7 @@ private:
     };
 
     String              maURL;          /// Source document URL.
-    String              maTables;       /// List of source range names.
+    OUString            maTables;       /// List of source range names.
     ScRange             maDestRange;    /// Destination range.
     XclImpWebQueryMode  meMode;         /// Current mode of the web query.
     sal_uInt16          mnRefresh;      /// Refresh time in minutes.
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 1f170092c959..90506f4f8954 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -996,8 +996,8 @@ void ScXMLTableRowCellContext::SetCellRangeSource( const ScAddress& rPosition )
             ScRange aDestRange( rPosition.Col(), rPosition.Row(), rPosition.Tab(),
                 rPosition.Col() + static_cast<SCCOL>(pCellRangeSource->nColumns - 1),
                 rPosition.Row() + static_cast<SCROW>(pCellRangeSource->nRows - 1), rPosition.Tab() );
-            String sFilterName( pCellRangeSource->sFilterName );
-            String sSourceStr( pCellRangeSource->sSourceStr );
+            OUString sFilterName( pCellRangeSource->sFilterName );
+            OUString sSourceStr( pCellRangeSource->sSourceStr );
             ScAreaLink* pLink = new ScAreaLink( pDoc->GetDocumentShell(), pCellRangeSource->sURL,
                 sFilterName, pCellRangeSource->sFilterOptions, sSourceStr, aDestRange, pCellRangeSource->nRefresh );
             sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 3f087c88fb73..c6745fbb80f7 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -58,9 +58,9 @@ TYPEINIT1(ScAreaLink,::sfx2::SvBaseLink);
 
 //------------------------------------------------------------------------
 
-ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const String& rFile,
-                        const String& rFilter, const String& rOpt,
-                        const String& rArea, const ScRange& rDest,
+ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
+                        const OUString& rFilter, const OUString& rOpt,
+                        const OUString& rArea, const ScRange& rDest,
                         sal_uLong nRefresh ) :
     ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,FORMAT_FILE),
     ScRefreshTimer  ( nRefresh ),
@@ -127,8 +127,8 @@ void ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
             aArea = aSourceArea;
 
             // adjust in dialog:
-            String aNewLinkName;
-            String aTmp = aFilter;
+            OUString aNewLinkName;
+            OUString aTmp = aFilter;
             sfx2::MakeLnkName(aNewLinkName, NULL, aFile, aArea, &aTmp);
             aFilter = aTmp;
             SetName( aNewLinkName );
@@ -168,8 +168,8 @@ void ScAreaLink::SetDestArea(const ScRange& rNew)
     aDestArea = rNew;           // fuer Undo
 }
 
-void ScAreaLink::SetSource(const String& rDoc, const String& rFlt, const String& rOpt,
-                                const String& rArea)
+void ScAreaLink::SetSource(const OUString& rDoc, const OUString& rFlt, const OUString& rOpt,
+                                const OUString& rArea)
 {
     aFileName   = rDoc;
     aFilterName = rFlt;
@@ -177,13 +177,13 @@ void ScAreaLink::SetSource(const String& rDoc, const String& rFlt, const String&
     aSourceArea = rArea;
 
     //  also update link name for dialog
-    String aNewLinkName;
+    OUString aNewLinkName;
     sfx2::MakeLnkName( aNewLinkName, NULL, aFileName, aSourceArea, &aFilterName );
     SetName( aNewLinkName );
 }
 
-bool ScAreaLink::IsEqual( const String& rFile, const String& rFilter, const String& rOpt,
-                            const String& rSource, const ScRange& rDest ) const
+bool ScAreaLink::IsEqual( const OUString& rFile, const OUString& rFilter, const OUString& rOpt,
+                            const OUString& rSource, const ScRange& rDest ) const
 {
     return aFileName == rFile && aFilterName == rFilter && aOptions == rOpt &&
             aSourceArea == rSource && aDestArea.aStart == rDest.aStart;
@@ -229,12 +229,12 @@ bool ScAreaLink::FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUStr
 
 //  ausfuehren:
 
-sal_Bool ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
-                            const String& rNewArea, sal_uLong nNewRefresh )
+sal_Bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter,
+                            const OUString& rNewArea, sal_uLong nNewRefresh )
 {
     //  Dokument laden - wie TabLink
 
-    if (!rNewFile.Len() || !rNewFilter.Len())
+    if (rNewFile.isEmpty() || rNewFilter.isEmpty())
         return false;
 
     String aNewUrl( ScGlobal::GetAbsDocName( rNewFile, pImpl->m_pDocSh ) );
@@ -251,7 +251,7 @@ sal_Bool ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter,
 
     //  wenn neuer Filter ausgewaehlt wurde, Optionen vergessen
     if ( rNewFilter != aFilterName )
-        aOptions.Erase();
+        aOptions = "";
 
     SfxMedium* pMed = new SfxMedium(aNewUrl, STREAM_STD_READ, pFilter);
 
@@ -504,7 +504,7 @@ IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl)
                  pImpl->m_pDialog->GetSource(), pImpl->m_pDialog->GetRefresh() );
 
         //  copy source data from members (set in Refresh) into link name for dialog
-        String aNewLinkName;
+        OUString aNewLinkName;
         sfx2::MakeLnkName( aNewLinkName, NULL, aFileName, aSourceArea, &aFilterName );
         SetName( aNewLinkName );
     }
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index c28843a99aec..81b315f22452 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -5222,7 +5222,7 @@ sal_Bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNe
 //------------------------------------------------------------------------
 
 sal_Bool ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
-                                const String& rOptions, const String& rSource,
+                                const String& rOptions, const OUString& rSource,
                                 const ScRange& rDestRange, sal_uLong nRefresh,
                                 sal_Bool bFitBlock, sal_Bool bApi )
 {
@@ -5278,7 +5278,7 @@ sal_Bool ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
 
     ScAreaLink* pLink = new ScAreaLink( &rDocShell, rFile, aFilterName,
                                         aNewOptions, rSource, rDestRange, nRefresh );
-    String aTmp = aFilterName;
+    OUString aTmp = aFilterName;
     pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, rFile, &aTmp, &rSource );
 
     //  Undo fuer den leeren Link
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 3bcc6c465730..40cbb2b652c3 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2313,7 +2313,7 @@ void ScExternalRefManager::maybeLinkExternalFile(sal_uInt16 nFileId)
     sfx2::LinkManager* pLinkMgr = mpDoc->GetLinkManager();
     ScExternalRefLink* pLink = new ScExternalRefLink(mpDoc, nFileId, aFilter);
     OSL_ENSURE(pFileName, "ScExternalRefManager::insertExternalFileLink: file name pointer is NULL");
-    String aTmp = aFilter;
+    OUString aTmp = aFilter;
     pLinkMgr->InsertFileLink(*pLink, OBJECT_CLIENT_FILE, *pFileName, &aTmp);
 
     pLink->SetDoReferesh(false);
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 1a03612440c2..3a2e2c1c00ec 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -197,8 +197,8 @@ public:
     virtual sal_Bool        CreateNames( const ScRange& rRange, sal_uInt16 nFlags, sal_Bool bApi, SCTAB nTab = -1 ); // -1 for global range names
     virtual sal_Bool        InsertNameList( const ScAddress& rStartPos, sal_Bool bApi );
 
-    virtual sal_Bool        InsertAreaLink( const String& rFile, const String& rFilter,
-                                            const String& rOptions, const String& rSource,
+    sal_Bool                InsertAreaLink( const String& rFile, const String& rFilter,
+                                            const String& rOptions, const OUString& rSource,
                                             const ScRange& rDestRange, sal_uLong nRefresh,
                                             sal_Bool bFitBlock, sal_Bool bApi );
 
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index def653f2cd54..293bb3997815 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -741,9 +741,9 @@ class ScUndoInsertAreaLink : public ScSimpleUndo
 public:
                     TYPEINFO();
                     ScUndoInsertAreaLink( ScDocShell* pShell,
-                                          const String& rDoc,
-                                          const String& rFlt, const String& rOpt,
-                                          const String& rArea, const ScRange& rDestRange,
+                                          const OUString& rDocName,
+                                          const OUString& rFltName, const String& rOptions,
+                                          const OUString& rAreaName, const ScRange& rDestRange,
                                           sal_uLong nRefreshDelay );
     virtual         ~ScUndoInsertAreaLink();
 
@@ -755,10 +755,10 @@ public:
     virtual OUString GetComment() const;
 
 private:
-    String          aDocName;
-    String          aFltName;
+    OUString        aDocName;
+    OUString        aFltName;
     String          aOptions;
-    String          aAreaName;
+    OUString        aAreaName;
     ScRange         aRange;
     sal_uLong           nRefreshDelay;
 };
@@ -769,9 +769,9 @@ class ScUndoRemoveAreaLink : public ScSimpleUndo
 public:
                     TYPEINFO();
                     ScUndoRemoveAreaLink( ScDocShell* pShell,
-                                          const String& rDoc,
-                                          const String& rFlt, const String& rOpt,
-                                          const String& rArea, const ScRange& rDestRange,
+                                          const OUString& rDocName,
+                                          const OUString& rFltName, const String& rOptions,
+                                          const OUString& rAreaName, const ScRange& rDestRange,
                                           sal_uLong nRefreshDelay );
     virtual         ~ScUndoRemoveAreaLink();
 
@@ -783,10 +783,10 @@ public:
     virtual OUString GetComment() const;
 
 private:
-    String          aDocName;
-    String          aFltName;
+    OUString        aDocName;
+    OUString        aFltName;
     String          aOptions;
-    String          aAreaName;
+    OUString        aAreaName;
     ScRange         aRange;
     sal_uLong           nRefreshDelay;
 };
diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx
index 7ba63de6a3d9..f44b09865884 100644
--- a/sc/source/ui/undo/areasave.cxx
+++ b/sc/source/ui/undo/areasave.cxx
@@ -80,7 +80,7 @@ void ScAreaLinkSaver::InsertNewLink( ScDocument* pDoc ) const
                                             aSourceArea, aDestArea.aStart, nRefresh );
         pLink->SetInCreate( sal_True );
         pLink->SetDestArea( aDestArea );
-        String aTmp1(aFilterName), aTmp2(aSourceArea);
+        OUString aTmp1(aFilterName), aTmp2(aSourceArea);
         pLinkManager->InsertFileLink( *pLink, OBJECT_CLIENT_FILE, aFileName, &aTmp1, &aTmp2 );
         pLink->Update();
         pLink->SetInCreate( false );
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 6a527f3e79aa..e16d5f0d6ea3 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -1489,9 +1489,9 @@ static ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const Stri
 }
 
 ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
-                            const String& rDoc,
-                            const String& rFlt, const String& rOpt,
-                            const String& rArea, const ScRange& rDestRange,
+                            const OUString& rDoc,
+                            const OUString& rFlt, const String& rOpt,
+                            const OUString& rArea, const ScRange& rDestRange,
                             sal_uLong nRefresh )
     :   ScSimpleUndo    ( pShell ),
         aDocName        ( rDoc ),
@@ -1552,8 +1552,8 @@ bool ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 }
 
 ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
-                            const String& rDoc, const String& rFlt, const String& rOpt,
-                            const String& rArea, const ScRange& rDestRange,
+                            const OUString& rDoc, const OUString& rFlt, const String& rOpt,
+                            const OUString& rArea, const ScRange& rDestRange,
                             sal_uLong nRefresh )
     :   ScSimpleUndo    ( pShell ),
         aDocName        ( rDoc ),
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 790cbd1841b5..9d10c2507ebf 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2403,8 +2403,8 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
         sfx2::LinkManager* pLinkManager = pDoc->GetLinkManager();
 
         SfxMedium* pMed = pSrcShell->GetMedium();
-        String aFileName = pMed->GetName();
-        String aFilterName;
+        OUString aFileName = pMed->GetName();
+        OUString aFilterName;
         if (pMed->GetFilter())
             aFilterName = pMed->GetFilter()->GetFilterName();
         String aOptions = ScDocumentLoader::GetOptions(*pMed);
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 0b5d631b24a5..aaf29122bb31 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -123,8 +123,8 @@ protected:
     bool        mbLoopSound;
     bool        mbStopSound;
     String      maCreatedPageName;        ///< generated page name by GetPageName.
-    String      maFileName;               ///< file name.
-    String      maBookmarkName;           ///< Bookmark name.
+    OUString    maFileName;               ///< file name.
+    OUString    maBookmarkName;           ///< Bookmark name.
     sal_Bool    mbScaleObjects;           ///< Objects should be scaled
     sal_Bool    mbBackgroundFullSize;     ///< Background object to represent the whole page.
     rtl_TextEncoding meCharSet;           ///< Text encoding
diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx
index 1f3612d5cd33..0aacfc473685 100644
--- a/sd/source/core/pglink.cxx
+++ b/sd/source/core/pglink.cxx
@@ -70,9 +70,9 @@ SdPageLink::~SdPageLink()
         * Only standard pages are allowed to be linked
         * The corresponding note pages are updated automaticly
         **********************************************************************/
-        String aFileName;
-        String aBookmarkName;
-        String aFilterName;
+        OUString aFileName;
+        OUString aBookmarkName;
+        OUString aFilterName;
         pLinkManager->GetDisplayNames( this,0, &aFileName, &aBookmarkName,
                                       &aFilterName);
         pPage->SetFileName(aFileName);
@@ -85,7 +85,7 @@ SdPageLink::~SdPageLink()
             /******************************************************************
             * the linked page is replaced in the model
             ******************************************************************/
-            if (aBookmarkName.Len() == 0)
+            if (aBookmarkName.isEmpty())
             {
                 // no page name specified: we assume it is the first page
                 aBookmarkName = pBookmarkDoc->GetSdPage(0, PK_STANDARD)->GetName();
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 1b4f9ab7fec9..96ef7dfe26a3 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -321,7 +321,7 @@ void SdPage::ConnectLink()
 {
     sfx2::LinkManager* pLinkManager = pModel!=NULL ? pModel->GetLinkManager() : NULL;
 
-    if (pLinkManager && !mpPageLink && maFileName.Len() && maBookmarkName.Len() &&
+    if (pLinkManager && !mpPageLink && !maFileName.isEmpty() && !maBookmarkName.isEmpty() &&
         mePageKind==PK_STANDARD && !IsMasterPage() &&
         ( (SdDrawDocument*) pModel)->IsNewOrLoadCompleted())
     {
@@ -335,7 +335,7 @@ void SdPage::ConnectLink()
         {
             // No links to document owned pages!
             mpPageLink = new SdPageLink(this, maFileName, maBookmarkName);
-            String aFilterName(SdResId(STR_IMPRESS));
+            OUString aFilterName(SdResId(STR_IMPRESS));
             pLinkManager->InsertFileLink(*mpPageLink, OBJECT_CLIENT_FILE,
                                          maFileName, &aFilterName, &maBookmarkName);
             mpPageLink->Connect();
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 563d378a09e5..e9e827ee3f73 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -642,7 +642,7 @@ bool SfxDdeDocTopic_Impl::StartAdviseLoop()
     if( pNewObj )
     {
         // then we also establish a corresponding SvBaseLink
-        String sNm, sTmp( Application::GetAppName() );
+        OUString sNm, sTmp( Application::GetAppName() );
         ::sfx2::MakeLnkName( sNm, &sTmp, pSh->GetTitle(SFX_TITLE_FULLNAME), GetCurItem() );
         new ::sfx2::SvBaseLink( sNm, OBJECT_DDE_EXTERN, pNewObj );
         bRet = true;
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 5cf77dbdf7e8..a974726cd818 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -305,7 +305,7 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
 {
     GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
 
-    const sal_uInt16 nFilter = sFilter.Len() && rGF.GetImportFormatCount()
+    const sal_uInt16 nFilter = !sFilter.isEmpty() && rGF.GetImportFormatCount()
                             ? rGF.GetImportFormatNumber( sFilter )
                             : GRFILTER_FORMAT_DONTKNOW;
 
@@ -358,12 +358,12 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream )
             DBG_WARNING3( "Graphic error [%d] - [%s] URL[%s]",
                             nRes,
                             xMed->GetPhysicalName().getStr(),
-                            sFileNm.GetBuffer() );
+                            sFileNm.getStr() );
         }
         else
         {
             DBG_WARNING2( "Graphic error [%d] - [%s]",
-                            nRes, sFileNm.GetBuffer() );
+                            nRes, sFileNm.getStr() );
         }
     }
 #endif
@@ -420,7 +420,7 @@ String impl_getFilter( const String& _rURL )
 void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& rEndEditHdl )
 {
     aEndEditLink = rEndEditHdl;
-    String sFile, sRange, sTmpFilter;
+    OUString sFile, sRange, sTmpFilter;
     if( pLink && pLink->GetLinkManager() )
     {
         pLink->GetLinkManager()->GetDisplayNames( pLink, 0, &sFile, &sRange, &sTmpFilter );
@@ -439,15 +439,15 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
                 if( !aDlg.Execute() )
                 {
                     sFile = aDlg.GetPath();
-                    sFile += ::sfx2::cTokenSeparator;
-                    sFile += ::sfx2::cTokenSeparator;
+                    sFile += OUString(::sfx2::cTokenSeparator);
+                    sFile += OUString(::sfx2::cTokenSeparator);
                     sFile += aDlg.GetCurrentFilter();
 
                     if ( aEndEditLink.IsSet() )
                         aEndEditLink.Call( &sFile );
                 }
                 else
-                    sFile.Erase();
+                    sFile = "";
             }
             break;
 
@@ -483,7 +483,7 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r
             break;
 
             default:
-                sFile.Erase();
+                sFile = "";
         }
     }
 }
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index ac81e463b0cc..f0e2eba0b764 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -30,8 +30,8 @@ namespace sfx2 { class FileDialogHelper; }
 
 class SvFileObject : public sfx2::SvLinkSource
 {
-    String              sFileNm;
-    String              sFilter;
+    OUString            sFileNm;
+    OUString            sFilter;
     String              sReferer;
     Link                aEndEditLink;
     SfxMediumRef        xMed;
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 4d0774117937..b036cfcb5f0f 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -85,7 +85,7 @@ SvDDELinkEditDialog::SvDDELinkEditDialog( Window* pParent, SvBaseLink* pLink )
 {
     FreeResource();
 
-    String sServer, sTopic, sItem;
+    OUString sServer, sTopic, sItem;
     pLink->GetLinkManager()->GetDisplayNames( pLink, &sServer, &sTopic, &sItem );
 
     aEdDdeApp.SetText( sServer );
@@ -96,12 +96,12 @@ SvDDELinkEditDialog::SvDDELinkEditDialog( Window* pParent, SvBaseLink* pLink )
     aEdDdeTopic.SetModifyHdl( STATIC_LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
     aEdDdeItem.SetModifyHdl( STATIC_LINK( this, SvDDELinkEditDialog, EditHdl_Impl));
 
-    aOKButton1.Enable( sServer.Len() && sTopic.Len() && sItem.Len() );
+    aOKButton1.Enable( !sServer.isEmpty() && !sTopic.isEmpty() && !sItem.isEmpty() );
 }
 
 String SvDDELinkEditDialog::GetCmd() const
 {
-    String sCmd( aEdDdeApp.GetText() ), sRet;
+    OUString sCmd( aEdDdeApp.GetText() ), sRet;
     ::sfx2::MakeLnkName( sRet, &sCmd, aEdDdeTopic.GetText(), aEdDdeItem.GetText() );
     return sRet;
 }
@@ -215,10 +215,10 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
     if( !pSvLink->GetLinkManager() )
         return sal_False;
 
-    String sServer, sTopic;
+    OUString sServer, sTopic;
     pSvLink->GetLinkManager()->GetDisplayNames( pSvLink, &sServer, &sTopic, &sItem );
 
-    if( !sServer.Len() || !sTopic.Len() || !sItem.Len() )
+    if( sServer.isEmpty() || sTopic.isEmpty() || sItem.isEmpty() )
         return sal_False;
 
     pConnection = new DdeConnection( sServer, sTopic );
@@ -226,7 +226,7 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
     {
        // Is it possible to address the system-Topic?
        // then the server is up, it just does not know the topic!
-        if( sTopic.EqualsIgnoreCaseAscii( "SYSTEM" ) )
+        if( sTopic.equalsIgnoreAsciiCase( "SYSTEM" ) )
         {
             sal_Bool bSysTopic;
             {
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index c2e436a13dff..1f80a70e33c3 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -33,7 +33,7 @@ namespace sfx2
 
 class SvDDEObject : public SvLinkSource
 {
-    String sItem;
+    OUString sItem;
 
     DdeConnection* pConnection;
     DdeLink* pLink;
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 7dcccadc2e85..16b85df5317b 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -179,7 +179,7 @@ sal_Bool LinkManager::Insert( SvBaseLink* pLink )
 sal_Bool LinkManager::InsertLink( SvBaseLink * pLink,
                                 sal_uInt16 nObjType,
                                 sal_uInt16 nUpdateMode,
-                                const String* pName )
+                                const OUString* pName )
 {
     // This First
     pLink->SetObjType( nObjType );
@@ -191,14 +191,14 @@ sal_Bool LinkManager::InsertLink( SvBaseLink * pLink,
 
 
 sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink,
-                                    const String& rServer,
-                                    const String& rTopic,
-                                    const String& rItem )
+                                    const OUString& rServer,
+                                    const OUString& rTopic,
+                                    const OUString& rItem )
 {
     if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
         return sal_False;
 
-    String sCmd;
+    OUString sCmd;
     ::sfx2::MakeLnkName( sCmd, &rServer, rTopic, rItem );
 
     pLink->SetObjType( OBJECT_CLIENT_DDE );
@@ -222,10 +222,10 @@ sal_Bool LinkManager::InsertDDELink( SvBaseLink * pLink )
 
 // Obtain the string for the dialog
 bool LinkManager::GetDisplayNames( const SvBaseLink * pLink,
-                                        String* pType,
-                                        String* pFile,
-                                        String* pLinkStr,
-                                        String* pFilter ) const
+                                        OUString* pType,
+                                        OUString* pFile,
+                                        OUString* pLinkStr,
+                                        OUString* pFilter ) const
 {
     bool bRet = false;
     const String sLNm( pLink->GetLinkSourceName() );
@@ -283,23 +283,6 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink,
     return bRet;
 }
 
-bool LinkManager::GetDisplayNames(
-    const SvBaseLink* pLink, OUString* pType, OUString* pFile,
-    OUString* pLinkStr, OUString* pFilter) const
-{
-    String aType, aFile, aLinkStr, aFilter;
-    bool bRet = GetDisplayNames(pLink, &aType, &aFile, &aLinkStr, &aFilter);
-    if (pType)
-        *pType = aType;
-    if (pFile)
-        *pFile = aFile;
-    if (pLinkStr)
-        *pLinkStr = aLinkStr;
-    if (pFilter)
-        *pFilter = aFilter;
-    return bRet;
-}
-
 void LinkManager::UpdateAllLinks(
     bool bAskUpdate,
     bool /*bCallErrHdl*/,
@@ -389,26 +372,26 @@ void LinkManager::RemoveServer( SvLinkSource* pObj )
 }
 
 
-void MakeLnkName( String& rName, const String* pType, const String& rFile,
-                    const String& rLink, const String* pFilter )
+void MakeLnkName( OUString& rName, const OUString* pType, const OUString& rFile,
+                    const OUString& rLink, const OUString* pFilter )
 {
     if( pType )
     {
         rName = comphelper::string::strip(*pType, ' ');
-        rName += cTokenSeparator;
+        rName += OUString(cTokenSeparator);
     }
-    else if( rName.Len() )
-        rName.Erase();
+    else if( !rName.isEmpty() )
+        rName = "";
 
     rName += rFile;
 
     rName = comphelper::string::strip(rName, ' ');
-    rName += cTokenSeparator;
+    rName += OUString(cTokenSeparator);
     rName = comphelper::string::strip(rName, ' ');
     rName += rLink;
     if( pFilter )
     {
-        rName += cTokenSeparator;
+        rName += OUString(cTokenSeparator);
         rName += *pFilter;
         rName = comphelper::string::strip(rName, ' ');
     }
@@ -426,11 +409,11 @@ void LinkManager::ReconnectDdeLink(SfxObjectShell& rServer)
     for (size_t i = 0; i < n; ++i)
     {
         ::sfx2::SvBaseLink* p = *rLinks[i];
-        String aType, aFile, aLink, aFilter;
+        OUString aType, aFile, aLink, aFilter;
         if (!GetDisplayNames(p, &aType, &aFile, &aLink, &aFilter))
             continue;
 
-        if (!aType.EqualsAscii("soffice"))
+        if (aType != "soffice")
             // DDE connections between OOo apps are always named 'soffice'.
             continue;
 
@@ -443,7 +426,7 @@ void LinkManager::ReconnectDdeLink(SfxObjectShell& rServer)
             // This DDE link is not associated with this server shell...  Skip it.
             continue;
 
-        if (!aLink.Len())
+        if (aLink.isEmpty())
             continue;
 
         LinkServerShell(aLink, rServer, *p);
@@ -464,25 +447,6 @@ void LinkManager::LinkServerShell(const OUString& rPath, SfxObjectShell& rServer
     }
 }
 
-bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink,
-                                    sal_uInt16 nFileType,
-                                    const String& rFileNm,
-                                    const String* pFilterNm,
-                                    const String* pRange )
-{
-    if( !( OBJECT_CLIENT_SO & rLink.GetObjType() ))
-        return false;
-
-    String sCmd( rFileNm );
-    sCmd += ::sfx2::cTokenSeparator;
-    if( pRange )
-        sCmd += *pRange;
-    if( pFilterNm )
-        ( sCmd += ::sfx2::cTokenSeparator ) += *pFilterNm;
-
-    return InsertLink( &rLink, nFileType, sfx2::LINKUPDATE_ONCALL, &sCmd );
-}
-
 bool LinkManager::InsertFileLink(
     sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const OUString& rFileNm,
     const OUString* pFilterNm, const OUString* pRange)
@@ -503,7 +467,7 @@ bool LinkManager::InsertFileLink(
         aBuf.append(*pFilterNm);
     }
 
-    String aCmd = aBuf.makeStringAndClear();
+    OUString aCmd = aBuf.makeStringAndClear();
     return InsertLink(&rLink, nFileType, sfx2::LINKUPDATE_ONCALL, &aCmd);
 }
 
@@ -540,7 +504,7 @@ sal_uIntPtr LinkManager::RegisterStatusInfoId()
 
 // ----------------------------------------------------------------------
 
-sal_Bool LinkManager::GetGraphicFromAny( const String& rMimeType,
+sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue,
                                 Graphic& rGrf )
 {
@@ -598,9 +562,9 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
 {
     SfxObjectShell* pFndShell = 0;
     sal_uInt16 nUpdateMode = com::sun::star::document::UpdateDocMode::NO_UPDATE;
-    String sTopic, sItem, sReferer;
+    OUString sTopic, sItem, sReferer;
     LinkManager* pLinkMgr = pLink->GetLinkManager();
-    if (pLinkMgr && pLinkMgr->GetDisplayNames(pLink, 0, &sTopic, &sItem) && sTopic.Len())
+    if (pLinkMgr && pLinkMgr->GetDisplayNames(pLink, 0, &sTopic, &sItem) && !sTopic.isEmpty())
     {
         // first only loop over the DocumentShells the shells and find those
         // with the name:
@@ -656,7 +620,7 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
     }
 
     // empty topics are not allowed - which document is it
-    if( !sTopic.Len() )
+    if( sTopic.isEmpty() )
         return sal_False;
 
     if (pFndShell)
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 3692a1654050..6bf55d5127ed 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -481,25 +481,25 @@ bool SvBaseLink::ExecuteEdit( const OUString& _rNewName )
         SetLinkSourceName( _rNewName );
         if( !Update() )
         {
-            String sApp, sTopic, sItem, sError;
+            OUString sApp, sTopic, sItem, sError;
             pImpl->m_pLinkMgr->GetDisplayNames( this, &sApp, &sTopic, &sItem );
             if( nObjType == OBJECT_CLIENT_DDE )
             {
                 sError = SFX2_RESSTR(STR_DDE_ERROR);
 
-                sal_uInt16 nFndPos = sError.Search( '%' );
-                if( STRING_NOTFOUND != nFndPos )
+                sal_Int32 nFndPos = sError.indexOf( '%' );
+                if( -1 != nFndPos )
                 {
-                    sError.Erase( nFndPos, 1 ).Insert( sApp, nFndPos );
-                    nFndPos = nFndPos + sApp.Len();
+                    sError = sError.replaceAt( nFndPos, 1, sApp );
+                    nFndPos = nFndPos + sApp.getLength();
                 }
-                if( STRING_NOTFOUND != ( nFndPos = sError.Search( '%', nFndPos )))
+                if( -1 != ( nFndPos = sError.indexOf( '%', nFndPos )))
                 {
-                    sError.Erase( nFndPos, 1 ).Insert( sTopic, nFndPos );
-                    nFndPos = nFndPos + sTopic.Len();
+                    sError = sError.replaceAt( nFndPos, 1, sTopic );
+                    nFndPos = nFndPos + sTopic.getLength();
                 }
-                if( STRING_NOTFOUND != ( nFndPos = sError.Search( '%', nFndPos )))
-                    sError.Erase( nFndPos, 1 ).Insert( sItem, nFndPos );
+                if( -1 != ( nFndPos = sError.indexOf( '%', nFndPos )))
+                    sError = sError.replaceAt( nFndPos, 1, sItem );
             }
             else
                 return false;
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index b49ce9d25584..e8ea0945d81b 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -900,9 +900,9 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl()
         sfx2::LinkManager* pLinkManager = pModel ? pModel->GetLinkManager() : NULL;
         if ( pLinkManager )
         {
-            String aNewLinkURL;
+            OUString aNewLinkURL;
             pLinkManager->GetDisplayNames( mpImpl->mpObjectLink, 0, &aNewLinkURL, 0, 0 );
-            if ( !aNewLinkURL.EqualsIgnoreCaseAscii( mpImpl->maLinkURL ) )
+            if ( !aNewLinkURL.equalsIgnoreAsciiCase( mpImpl->maLinkURL ) )
             {
                 const_cast<SdrOle2Obj*>(this)->GetObjRef_Impl();
                 uno::Reference< embed::XCommonEmbedPersist > xPersObj( xObjRef.GetObject(), uno::UNO_QUERY );
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index ec379dfc8537..1829b90de366 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -80,12 +80,12 @@ void ImpSdrObjTextLink::Closed()
         ImpSdrObjTextLinkUserData* pData=pSdrObj->GetLinkUserData();
         if( pData )
         {
-            String aFile;
-            String aFilter;
+            OUString aFile;
+            OUString aFilter;
             pLinkManager->GetDisplayNames( this, 0,&aFile, 0, &aFilter );
 
-            if( !pData->aFileName.Equals( aFile ) ||
-                !pData->aFilterName.Equals( aFilter ))
+            if( pData->aFileName != aFile ||
+                pData->aFilterName != aFilter )
             {
                 pData->aFileName = aFile;
                 pData->aFilterName = aFilter;
@@ -267,17 +267,11 @@ void SdrTextObj::ImpLinkAnmeldung()
     ImpSdrObjTextLinkUserData* pData=GetLinkUserData();
     sfx2::LinkManager* pLinkManager=pModel!=NULL ? pModel->GetLinkManager() : NULL;
     if (pLinkManager!=NULL && pData!=NULL && pData->pLink==NULL) { // don't register twice
-        pData->pLink=new ImpSdrObjTextLink(this);
-#ifdef __GNUC__
+        pData->pLink = new ImpSdrObjTextLink(this);
         pLinkManager->InsertFileLink(*pData->pLink,OBJECT_CLIENT_FILE,pData->aFileName,
-                                     pData->aFilterName.Len() ?
-                                      &pData->aFilterName : (const String *)NULL,
-                                     (const String *)NULL);
-#else
-        pLinkManager->InsertFileLink(*pData->pLink,OBJECT_CLIENT_FILE,pData->aFileName,
-                                     pData->aFilterName.Len() ? &pData->aFilterName : NULL,NULL);
-#endif
-        pData->pLink->Connect();
+                                     !pData->aFilterName.isEmpty() ?
+                                      &pData->aFilterName : NULL,
+                                     NULL);
     }
 }
 
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 0d8c3b5cde67..c839abb4b3c3 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -74,7 +74,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
                SwGrfFmtColl* pGrfColl,
                SwAttrSet* pAutoAttr = 0 );
 
-    void InsertLink( const String& rGrfName, const String& rFltName );
+    void InsertLink( const OUString& rGrfName, const OUString& rFltName );
     sal_Bool ImportGraphic( SvStream& rStrm );
     sal_Bool HasStreamName() const { return maGrfObj.HasUserData(); }
     /** adjust return type and rename method to
@@ -171,7 +171,7 @@ public:
 
     /** Re-read in case graphic was not OK. The current one
        gets replaced by the new one. */
-    sal_Bool ReRead( const String& rGrfName, const String& rFltName,
+    sal_Bool ReRead( const String& rGrfName, const OUString& rFltName,
                  const Graphic* pGraphic = 0,
                  const GraphicObject* pGrfObj = 0,
                  sal_Bool bModify = sal_True );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index f63df89aa8ff..1750fd49db61 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -2486,7 +2486,7 @@ static ::sfx2::SvBaseLink* lcl_FindNextRemovableLink( const ::sfx2::SvBaseLinks&
         {
                 ::sfx2::SvBaseLinkRef xLink = pLnk;
 
-                String sFName;
+                OUString sFName;
                 rLnkMgr.GetDisplayNames( xLink, 0, &sFName, 0, 0 );
 
                 INetURLObject aURL( sFName );
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 4f3a744e37f1..6c0b540fe61d 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -134,7 +134,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
 }
 
 sal_Bool SwGrfNode::ReRead(
-    const String& rGrfName, const String& rFltName,
+    const String& rGrfName, const OUString& rFltName,
     const Graphic* pGraphic, const GraphicObject* pGrfObj,
     sal_Bool bNewGrf )
 {
@@ -153,11 +153,11 @@ sal_Bool SwGrfNode::ReRead(
         if( rGrfName.Len() )
         {
             // Note: If there is DDE in the FltName, than it is a DDE-linked graphic
-            String sCmd( rGrfName );
-            if( rFltName.Len() )
+            OUString sCmd( rGrfName );
+            if( !rFltName.isEmpty() )
             {
                 sal_uInt16 nNewType;
-                if( rFltName.EqualsAscii( "DDE" ))
+                if( rFltName == "DDE" )
                     nNewType = OBJECT_CLIENT_DDE;
                 else
                 {
@@ -644,7 +644,7 @@ sal_Bool SwGrfNode::RestorePersistentData()
     return sal_True;
 }
 
-void SwGrfNode::InsertLink( const String& rGrfName, const String& rFltName )
+void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
 {
     refLink = new SwBaseLink( sfx2::LINKUPDATE_ONCALL, FORMAT_GDIMETAFILE, this );
 
@@ -652,25 +652,25 @@ void SwGrfNode::InsertLink( const String& rGrfName, const String& rFltName )
     if( GetNodes().IsDocNodes() )
     {
         refLink->SetVisible( pIDLA->IsVisibleLinks() );
-        if( rFltName.EqualsAscii( "DDE" ))
+        if( rFltName == "DDE" )
         {
             sal_Int32 nTmp = 0;
             String sApp, sTopic, sItem;
-            sApp = rGrfName.GetToken( 0, sfx2::cTokenSeparator, nTmp );
-            sTopic = rGrfName.GetToken( 0, sfx2::cTokenSeparator, nTmp );
-            sItem = rGrfName.Copy( nTmp );
+            sApp = rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp );
+            sTopic = rGrfName.getToken( 0, sfx2::cTokenSeparator, nTmp );
+            sItem = rGrfName.copy( nTmp );
             pIDLA->GetLinkManager().InsertDDELink( refLink,
                                             sApp, sTopic, sItem );
         }
         else
         {
-            sal_Bool bSync = rFltName.EqualsAscii( "SYNCHRON" );
+            sal_Bool bSync = rFltName == "SYNCHRON";
             refLink->SetSynchron( bSync );
             refLink->SetContentType( SOT_FORMATSTR_ID_SVXB );
 
             pIDLA->GetLinkManager().InsertFileLink( *refLink,
                                             OBJECT_CLIENT_GRF, rGrfName,
-                                (!bSync && rFltName.Len() ? &rFltName : 0) );
+                                (!bSync && !rFltName.isEmpty() ? &rFltName : 0) );
         }
     }
     maGrfObj.SetLink( rGrfName );
@@ -946,15 +946,15 @@ SwCntntNode* SwGrfNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
     }
 
     const sfx2::LinkManager& rMgr = getIDocumentLinksAdministration()->GetLinkManager();
-    String sFile, sFilter;
+    OUString sFile, sFilter;
     if( IsLinkedFile() )
         rMgr.GetDisplayNames( refLink, 0, &sFile, 0, &sFilter );
     else if( IsLinkedDDE() )
     {
-        String sTmp1, sTmp2;
+        OUString sTmp1, sTmp2;
         rMgr.GetDisplayNames( refLink, &sTmp1, &sTmp2, &sFilter );
         sfx2::MakeLnkName( sFile, &sTmp1, sTmp2, sFilter );
-        sFilter.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "DDE" ));
+        sFilter = "DDE";
     }
 
     SwGrfNode* pGrfNd = pDoc->GetNodes().MakeGrfNode( rIdx, sFile, sFilter,
@@ -1039,7 +1039,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc )
         const sfx2::LinkManager& rLnkMgr = pDoc->GetLinkManager();
         const ::sfx2::SvBaseLinks& rLnks = rLnkMgr.GetLinks();
         SwGrfNode* pGrfNd;
-        String sFileNm;
+        OUString sFileNm;
         for( sal_uInt16 n = rLnks.size(); n; )
         {
             ::sfx2::SvBaseLink* pLnk = &(*rLnks[ --n ]);
@@ -1158,7 +1158,7 @@ void SwGrfNode::TriggerAsyncRetrieveInputStream()
     {
         mpThreadConsumer.reset( new SwAsyncRetrieveInputStreamThreadConsumer( *this ) );
 
-        String sGrfNm;
+        OUString sGrfNm;
         refLink->GetLinkManager()->GetDisplayNames( refLink, 0, &sGrfNm, 0, 0 );
 
         mpThreadConsumer->CreateThread( sGrfNm );
@@ -1212,10 +1212,9 @@ bool SwGrfNode::IsAsyncRetrieveInputStreamPossible() const
 
     if ( IsLinkedFile() )
     {
-        String sGrfNm;
+        OUString sGrfNm;
         refLink->GetLinkManager()->GetDisplayNames( refLink, 0, &sGrfNm, 0, 0 );
-        String sProtocol( "vnd.sun.star.pkg:" );
-        if ( sGrfNm.CompareTo( sProtocol, sProtocol.Len() ) != 0 )
+        if ( !sGrfNm.startsWith( "vnd.sun.star.pkg:" ) )
         {
             bRet = true;
         }
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index f459b9519cd3..34fc1a39120e 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -2020,7 +2020,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
                                 sal_Bool bMsg )
 {
     // data from Clipboardformat
-    String aApp, aTopic, aItem;
+    OUString aApp, aTopic, aItem;
 
     {
         SotStorageStreamRef xStrm;
@@ -2036,7 +2036,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
         aItem = read_zeroTerminated_uInt8s_ToOUString(*xStrm, eEncoding);
     }
 
-    String aCmd;
+    OUString aCmd;
     sfx2::MakeLnkName( aCmd, &aApp, aTopic, aItem );
 
     // do we want to read in a graphic now?