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

1 files changed, 24 insertions, 60 deletions

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)