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

Change-Id: I1ccca64a1e66e178e7dc35f926fefff26ab0598e

3 files changed, 23 insertions, 23 deletions

diff --git a/include/svtools/inetimg.hxx b/include/svtools/inetimg.hxx
index f28ac2cdedfe..e5a80b5bbb1e 100644
--- a/include/svtools/inetimg.hxx
+++ b/include/svtools/inetimg.hxx
@@ -29,28 +29,28 @@ class SotDataObject;
 
 class INetImage
 {
-    String          aImageURL;
-    String          aTargetURL;
-    String          aTargetFrame;
-    String          aAlternateText;
+    OUString        aImageURL;
+    OUString        aTargetURL;
+    OUString        aTargetFrame;
+    OUString        aAlternateText;
     Size            aSizePixel;
 
 protected:
-    String          CopyExchange() const;
-    void            PasteExchange( const String& rString );
+    OUString        CopyExchange() const;
+    void            PasteExchange( const OUString& rString );
 
-    void            SetImageURL( const String& rS )     { aImageURL = rS; }
-    void            SetTargetURL( const String& rS )    { aTargetURL = rS; }
-    void            SetTargetFrame( const String& rS )  { aTargetFrame = rS; }
-    void            SetAlternateText( const String& rS ){ aAlternateText = rS; }
+    void            SetImageURL( const OUString& rS )     { aImageURL = rS; }
+    void            SetTargetURL( const OUString& rS )    { aTargetURL = rS; }
+    void            SetTargetFrame( const OUString& rS )  { aTargetFrame = rS; }
+    void            SetAlternateText( const OUString& rS ){ aAlternateText = rS; }
     void            SetSizePixel( const Size& rSize )   { aSizePixel = rSize; }
 
 public:
                     INetImage(
-                        const String& rImageURL,
-                        const String& rTargetURL,
-                        const String& rTargetFrame,
-                        const String& rAlternateText,
+                        const OUString& rImageURL,
+                        const OUString& rTargetURL,
+                        const OUString& rTargetFrame,
+                        const OUString& rAlternateText,
                         const Size& rSizePixel )
                     :   aImageURL( rImageURL ),
                         aTargetURL( rTargetURL ),
@@ -61,10 +61,10 @@ public:
                     INetImage()
                     {}
 
-    const String&   GetImageURL() const { return aImageURL; }
-    const String&   GetTargetURL() const { return aTargetURL; }
-    const String&   GetTargetFrame() const { return aTargetFrame; }
-    const String&   GetAlternateText() const { return aAlternateText; }
+    const OUString& GetImageURL() const { return aImageURL; }
+    const OUString& GetTargetURL() const { return aTargetURL; }
+    const OUString& GetTargetFrame() const { return aTargetFrame; }
+    const OUString& GetAlternateText() const { return aAlternateText; }
     const Size&     GetSizePixel() const { return aSizePixel; }
 
     // Im-/Export
diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index e57c194b8870..17591c7158f0 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.cxx
@@ -115,16 +115,16 @@ sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat )
                 rIStm.Seek( nFilePos + nAltOffset );
                 aAlternateText = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet);
             }
-            else if( aAlternateText.Len() )
-                aAlternateText.Erase();
+            else if( !aAlternateText.isEmpty() )
+                aAlternateText = "";
 
             if( nAnchorOffset )
             {
                 rIStm.Seek( nFilePos + nAnchorOffset );
                 aTargetURL = read_zeroTerminated_uInt8s_ToOUString(rIStm, eSysCSet);
             }
-            else if( aTargetURL.Len() )
-                aTargetURL.Erase();
+            else if( !aTargetURL.isEmpty() )
+                aTargetURL = "";
 
             bRet = 0 == rIStm.GetError();
         }
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index b1f658329819..a09a05766e7e 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1909,7 +1909,7 @@ int SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
         ( rData.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_IMAGE ) &&
           rData.GetINetImage( SOT_FORMATSTR_ID_NETSCAPE_IMAGE, aINetImg )) )
     {
-        if( aINetImg.GetImageURL().Len() && bInsertGRF )
+        if( !aINetImg.GetImageURL().isEmpty() && bInsertGRF )
         {
             OUString sURL( aINetImg.GetImageURL() );
             SwTransferable::_CheckForURLOrLNKFile( rData, sURL );