More on String to rtl::OUString changes.

sc/source/core/data/documen8.cxx

@@ -1031,7 +1031,7 @@ void ScDocument::UpdateExternalRefLinks(Window* pWin)
             {
                 // Update failed.  Notify the user.
 
-                String aFile;
+                rtl::OUString aFile;
                 pLinkManager->GetDisplayNames(pRefLink, NULL, &aFile, NULL, NULL);
                 // Decode encoded URL for display friendliness.
                 INetURLObject aUrl(aFile,INetURLObject::WAS_ENCODED);

sc/source/ui/docshell/arealink.cxx

@@ -129,13 +129,8 @@ void ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
     sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
     if (pLinkManager!=NULL)
     {
-        String aTmp1;
-        String aTmp2;
-        String aTmp3;
-        pLinkManager->GetDisplayNames(this, NULL, &aTmp1, &aTmp2, &aTmp3);
-        rtl::OUString aFile = aTmp1;
-        rtl::OUString aArea = aTmp2;
-        rtl::OUString aFilter = aTmp3;
+        rtl::OUString aFile, aArea, aFilter;
+        pLinkManager->GetDisplayNames(this, NULL, &aFile, &aArea, &aFilter);
 
         //  the file dialog returns the filter name with the application prefix
         //  -> remove prefix
@@ -148,9 +143,9 @@ void ScAreaLink::Edit(Window* pParent, const Link& /* rEndEditHdl */ )
 
             // adjust in dialog:
             String aNewLinkName;
-            aTmp1 = aFilter;
-            sfx2::MakeLnkName(aNewLinkName, NULL, aFile, aArea, &aTmp1);
-            aFilter = aTmp1;
+            String aTmp = aFilter;
+            sfx2::MakeLnkName(aNewLinkName, NULL, aFile, aArea, &aTmp);
+            aFilter = aTmp;
             SetName( aNewLinkName );
         }
 

sc/source/ui/docshell/externalrefmgr.cxx

@@ -1250,7 +1250,7 @@ void ScExternalRefLink::Closed()
     if (!mbDoRefresh)
         return SUCCESS;
 
-    String aFile, aFilter;
+    rtl::OUString aFile, aFilter;
     mpDoc->GetLinkManager()->GetDisplayNames(this, NULL, &aFile, NULL, &aFilter);
     ScExternalRefManager* pMgr = mpDoc->GetExternalRefManager();
 

sc/source/ui/docshell/tablink.cxx

@@ -147,11 +147,8 @@ void ScTableLink::Edit( Window* pParent, const Link& rEndEditHdl )
     sfx2::LinkManager* pLinkManager=pImpl->m_pDocSh->GetDocument()->GetLinkManager();
     if (pLinkManager!=NULL)
     {
-        String aTmp1;
-        String aTmp2;
-        pLinkManager->GetDisplayNames(this, 0, &aTmp1, NULL, &aTmp2);
-        rtl::OUString aFile = aTmp1;
-        rtl::OUString aFilter = aTmp2;
+        rtl::OUString aFile, aFilter;
+        pLinkManager->GetDisplayNames(this, 0, &aFile, NULL, &aFilter);
 
         //  the file dialog returns the filter name with the application prefix
         //  -> remove prefix

sw/source/filter/ww8/ww8graf.cxx

@@ -2978,7 +2978,7 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
     {
         const SdrGrafObj *pGrf= (const SdrGrafObj*)rpObject;
         bool bDone = false;
-        if (pGrf->IsLinkedGraphic() && pGrf->GetFileName().Len())
+        if (pGrf->IsLinkedGraphic() && !pGrf->GetFileName().isEmpty())
         {
             GraphicType eType = pGrf->GetGraphicType();
             String aGrfName(