convert include/svtools/imap*.hxx from String to OUString

Change-Id: Iacfb93a4cf9a7b7ac0ae27b9fa6f765e74604dc2

11 files changed, 112 insertions, 112 deletions

diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 790cdebef60f..60dafcb4e130 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -38,27 +38,27 @@ class SVT_DLLPUBLIC ImageMap
 private:
 
     IMapObjectList_impl maList;
-    String              aName;
+    OUString            aName;
 
 protected:
 
     // Binaer laden/speichern
-    void                ImpWriteImageMap( SvStream& rOStm, const String& ) const ;
-    void                ImpReadImageMap( SvStream& rIStm, size_t nCount, const String& );
+    void                ImpWriteImageMap( SvStream& rOStm, const OUString& ) const ;
+    void                ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& );
 
     // Im-/Export
-    void                ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const;
-    void                ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const;
-    sal_uLong           ImpReadCERN( SvStream& rOStm, const String& rBaseURL );
-    sal_uLong           ImpReadNCSA( SvStream& rOStm, const String& rBaseURL );
+    void                ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
+    void                ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const;
+    sal_uLong           ImpReadCERN( SvStream& rOStm, const OUString& rBaseURL );
+    sal_uLong           ImpReadNCSA( SvStream& rOStm, const OUString& rBaseURL );
 
-    void                ImpReadCERNLine( const OString& rLine, const String& rBaseURL );
+    void                ImpReadCERNLine( const OString& rLine, const OUString& rBaseURL );
     Point               ImpReadCERNCoords( const char** ppStr );
     long                ImpReadCERNRadius( const char** ppStr );
-    String              ImpReadCERNURL( const char** ppStr, const String& rBaseURL );
+    OUString            ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL );
 
-    void                ImpReadNCSALine( const OString& rLine, const String& rBaseURL );
-    String              ImpReadNCSAURL( const char** ppStr, const String& rBaseURL );
+    void                ImpReadNCSALine( const OString& rLine, const OUString& rBaseURL );
+    OUString            ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL );
     Point               ImpReadNCSACoords( const char** ppStr );
 
     sal_uLong           ImpDetectFormat( SvStream& rIStm );
@@ -68,7 +68,7 @@ public:
     TYPEINFO();
 
                         ImageMap() {};
-                        ImageMap( const String& rName );
+                        ImageMap( const OUString& rName );
                         ImageMap( const ImageMap& rImageMap );
 
                         // Der Dtor gibt den intern belegten
@@ -114,18 +114,18 @@ public:
     sal_uInt16          GetVersion() const;
 
     // liefert / setzt den Namen der ImageMap
-    const String&       GetName() const { return aName; }
-    void                SetName( const String& rName ) { aName = rName; }
+    const OUString&     GetName() const { return aName; }
+    void                SetName( const OUString& rName ) { aName = rName; }
 
     // skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor
     void                Scale( const Fraction& rFractX, const Fraction& rFracY );
 
     // Im-/Export
-    void                Write ( SvStream& rOStm, const String& rBaseURL ) const;
-    void                Read( SvStream& rIStm, const String& rBaseURL );
+    void                Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
+    void                Read( SvStream& rIStm, const OUString& rBaseURL );
 
-    void                Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL ) const;
-    sal_uLong               Read( SvStream& rIStm, sal_uLong nFormat, const String& rBaseURL );
+    void                Write( SvStream& rOStm, sal_uLong nFormat, const OUString& rBaseURL ) const;
+    sal_uLong               Read( SvStream& rIStm, sal_uLong nFormat, const OUString& rBaseURL );
 };
 
 class IMapCompat
diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx
index 057561adad98..9ba93d4f5dfa 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/svtools/imapcirc.hxx
@@ -42,11 +42,11 @@ public:
 
                         IMapCircleObject() {};
                         IMapCircleObject( const Point& rCenter, sal_uLong nRad,
-                                          const String& rURL,
-                                          const String& rAltText,
-                                          const String& rDesc,
-                                          const String& rTarget,
-                                          const String& rName,
+                                          const OUString& rURL,
+                                          const OUString& rAltText,
+                                          const OUString& rDesc,
+                                          const OUString& rTarget,
+                                          const OUString& rName,
                                           sal_Bool bActive = sal_True,
                                           sal_Bool bPixelCoords = sal_True );
     virtual             ~IMapCircleObject() {};
@@ -66,8 +66,8 @@ public:
     sal_Bool                IsEqual( const IMapCircleObject& rEqObj );
 
     // Im-/Export
-    void                WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const;
-    void                WriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const;
+    void                WriteCERN( SvStream& rOStm, const OUString& rBaseURL  ) const;
+    void                WriteNCSA( SvStream& rOStm, const OUString& rBaseURL  ) const;
 };
 
 #endif
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index e90902bec0f0..7f383de1197c 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -54,13 +54,13 @@ class SVT_DLLPUBLIC IMapObject
 {
     friend class        ImageMap;
 
-    String              aURL;
-    String              aAltText;
-    String              aDesc;
-    String              aTarget;
-    String              aName;
+    OUString            aURL;
+    OUString            aAltText;
+    OUString            aDesc;
+    OUString            aTarget;
+    OUString            aName;
     SvxMacroTableDtor   aEventList;
-    sal_Bool                bActive;
+    sal_Bool            bActive;
 
 protected:
     sal_uInt16              nReadVersion;
@@ -71,20 +71,20 @@ protected:
 
     // Hilfsmethoden
     void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const;
-    void AppendCERNURL(OStringBuffer& rBuf, const String& rBaseURL) const;
+    void AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const;
     void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const;
-    void AppendNCSAURL(OStringBuffer&rBuf, const String& rBaseURL) const;
+    void AppendNCSAURL(OStringBuffer&rBuf, const OUString& rBaseURL) const;
 
 public:
 
     static rtl_TextEncoding nActualTextEncoding;
 
                         IMapObject();
-                        IMapObject( const String& rURL,
-                                    const String& rAltText,
-                                    const String& rDesc,
-                                    const String& rTarget,
-                                    const String& rName,
+                        IMapObject( const OUString& rURL,
+                                    const OUString& rAltText,
+                                    const OUString& rDesc,
+                                    const OUString& rTarget,
+                                    const OUString& rName,
                                     sal_Bool bActive );
     virtual             ~IMapObject() {};
 
@@ -92,25 +92,25 @@ public:
     virtual sal_uInt16      GetType() const = 0;
     virtual sal_Bool        IsHit( const Point& rPoint ) const = 0;
 
-    void                Write ( SvStream& rOStm, const String& rBaseURL ) const;
-    void                Read( SvStream& rIStm, const String& rBaseURL );
+    void                Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
+    void                Read( SvStream& rIStm, const OUString& rBaseURL );
 
     virtual Rectangle   GetBoundRect() const = 0;
 
-    const String&       GetURL() const { return aURL; }
-    void                SetURL( const String& rURL ) { aURL = rURL; }
+    const OUString&     GetURL() const { return aURL; }
+    void                SetURL( const OUString& rURL ) { aURL = rURL; }
 
-    const String&       GetAltText() const { return aAltText; }
-    void                SetAltText( const String& rAltText) { aAltText = rAltText; }
+    const OUString&     GetAltText() const { return aAltText; }
+    void                SetAltText( const OUString& rAltText) { aAltText = rAltText; }
 
-    const String&       GetDesc() const { return aDesc; }
-    void                SetDesc( const String& rDesc ) { aDesc = rDesc; }
+    const OUString&     GetDesc() const { return aDesc; }
+    void                SetDesc( const OUString& rDesc ) { aDesc = rDesc; }
 
-    const String&       GetTarget() const { return aTarget; }
-    void                SetTarget( const String& rTarget ) { aTarget = rTarget; }
+    const OUString&     GetTarget() const { return aTarget; }
+    void                SetTarget( const OUString& rTarget ) { aTarget = rTarget; }
 
-    const String&       GetName() const { return aName; }
-    void                SetName( const String& rName ) { aName = rName; }
+    const OUString&     GetName() const { return aName; }
+    void                SetName( const OUString& rName ) { aName = rName; }
 
     sal_Bool                IsActive() const { return bActive; }
     void                SetActive( sal_Bool bSetActive = sal_True ) { bActive = bSetActive; }
diff --git a/include/svtools/imappoly.hxx b/include/svtools/imappoly.hxx
index b4a0eafdb07d..172c163b6e64 100644
--- a/include/svtools/imappoly.hxx
+++ b/include/svtools/imappoly.hxx
@@ -40,16 +40,16 @@ protected:
     virtual void        WriteIMapObject( SvStream& rOStm ) const;
     virtual void        ReadIMapObject(  SvStream& rIStm );
 
-    sal_Bool                ReadPreProLine( SvStream& rIStm, String& rStr );
+    sal_Bool            ReadPreProLine( SvStream& rIStm, OUString& rStr );
 
 public:
                         IMapPolygonObject() {};
                         IMapPolygonObject( const Polygon& rPoly,
-                                           const String& rURL,
-                                           const String& rAltText,
-                                           const String& rDesc,
-                                           const String& rTarget,
-                                           const String& rName,
+                                           const OUString& rURL,
+                                           const OUString& rAltText,
+                                           const OUString& rDesc,
+                                           const OUString& rTarget,
+                                           const OUString& rName,
                                            sal_Bool bActive = sal_True,
                                            sal_Bool bPixelCoords = sal_True );
     virtual             ~IMapPolygonObject() {};
@@ -72,8 +72,8 @@ public:
     sal_Bool                IsEqual( const IMapPolygonObject& rEqObj );
 
     // Im-/Export
-    void                WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const;
-    void                WriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const;
+    void                WriteCERN( SvStream& rOStm, const OUString& rBaseURL  ) const;
+    void                WriteNCSA( SvStream& rOStm, const OUString& rBaseURL  ) const;
 };
 
 #endif
diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx
index b7d6ab54288a..d2a257c758e2 100644
--- a/include/svtools/imaprect.hxx
+++ b/include/svtools/imaprect.hxx
@@ -41,11 +41,11 @@ public:
 
                         IMapRectangleObject() {};
                         IMapRectangleObject( const Rectangle& rRect,
-                                             const String& rURL,
-                                             const String& rAltText,
-                                             const String& rDesc,
-                                             const String& rTarget,
-                                             const String& rName,
+                                             const OUString& rURL,
+                                             const OUString& rAltText,
+                                             const OUString& rDesc,
+                                             const OUString& rTarget,
+                                             const OUString& rName,
                                              sal_Bool bActive = sal_True,
                                              sal_Bool bPixelCoords = sal_True );
     virtual             ~IMapRectangleObject() {};
@@ -64,8 +64,8 @@ public:
     sal_Bool                IsEqual( const IMapRectangleObject& rEqObj );
 
     // Im-/Export
-    void                WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const;
-    void                WriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const;
+    void                WriteCERN( SvStream& rOStm, const OUString& rBaseURL  ) const;
+    void                WriteNCSA( SvStream& rOStm, const OUString& rBaseURL  ) const;
 };
 
 #endif
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 356c65923ae6..5a127d5b412d 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -239,7 +239,7 @@ sal_Bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
                     {
                         const IMapObject* pIMapObj =
                                 ScDrawLayer::GetHitIMapObject( aVEvt.pObj, aMDPos, *pWindow );
-                        if ( pIMapObj && pIMapObj->GetURL().Len() )
+                        if ( pIMapObj && !pIMapObj->GetURL().isEmpty() )
                         {
                             sURL = pIMapObj->GetURL();
                             sTarget = pIMapObj->GetTarget();
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 263569a153b4..fb7fcbba7f25 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1158,7 +1158,7 @@ sal_Bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
         {
             const IMapObject* pIMapObj = mpDoc->GetHitIMapObject( pObj, rPos, *mpWindow );
 
-            if ( pIMapObj && pIMapObj->GetURL().Len() )
+            if ( pIMapObj && !pIMapObj->GetURL().isEmpty() )
             {
                 // Jump to Document
                 mpWindow->ReleaseMouse();
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 597d90a34a3b..583978a2f693 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -53,8 +53,8 @@ IMapObject::IMapObject()
 {
 }
 
-IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc,
-                        const String& rTarget, const String& rName, sal_Bool bURLActive )
+IMapObject::IMapObject( const OUString& rURL, const OUString& rAltText, const OUString& rDesc,
+                        const OUString& rTarget, const OUString& rName, sal_Bool bURLActive )
 : aURL( rURL )
 , aAltText( rAltText )
 , aDesc( rDesc )
@@ -77,7 +77,7 @@ sal_uInt16 IMapObject::GetVersion() const
     return IMAP_OBJ_VERSION;
 }
 
-void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
+void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const
 {
     IMapCompat*             pCompat;
     const rtl_TextEncoding  eEncoding = osl_getThreadTextEncoding();
@@ -109,7 +109,7 @@ void IMapObject::Write( SvStream& rOStm, const String& rBaseURL ) const
 |*
 \******************************************************************************/
 
-void IMapObject::Read( SvStream& rIStm, const String& rBaseURL )
+void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
 {
     IMapCompat*         pCompat;
     rtl_TextEncoding    nTextEncoding;
@@ -153,11 +153,11 @@ sal_Bool IMapObject::IsEqual( const IMapObject& rEqObj )
 }
 
 IMapRectangleObject::IMapRectangleObject( const Rectangle& rRect,
-                                          const String& rURL,
-                                          const String& rAltText,
-                                          const String& rDesc,
-                                          const String& rTarget,
-                                          const String& rName,
+                                          const OUString& rURL,
+                                          const OUString& rAltText,
+                                          const OUString& rDesc,
+                                          const OUString& rTarget,
+                                          const OUString& rName,
                                           sal_Bool bURLActive,
                                           sal_Bool bPixelCoords ) :
             IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
@@ -253,11 +253,11 @@ sal_Bool IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj )
 }
 
 IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uLong nCircleRadius,
-                                    const String& rURL,
-                                    const String& rAltText,
-                                    const String& rDesc,
-                                    const String& rTarget,
-                                    const String& rName,
+                                    const OUString& rURL,
+                                    const OUString& rAltText,
+                                    const OUString& rDesc,
+                                    const OUString& rTarget,
+                                    const OUString& rName,
                                     sal_Bool bURLActive,
                                     sal_Bool bPixelCoords ) :
             IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive )
@@ -401,11 +401,11 @@ sal_Bool IMapCircleObject::IsEqual( const IMapCircleObject& rEqObj )
 }
 
 IMapPolygonObject::IMapPolygonObject( const Polygon& rPoly,
-                                      const String& rURL,
-                                      const String& rAltText,
-                                      const String& rDesc,
-                                      const String& rTarget,
-                                      const String& rName,
+                                      const OUString& rURL,
+                                      const OUString& rAltText,
+                                      const OUString& rDesc,
+                                      const OUString& rTarget,
+                                      const OUString& rName,
                                       sal_Bool bURLActive,
                                       sal_Bool bPixelCoords ) :
             IMapObject  ( rURL, rAltText, rDesc, rTarget, rName, bURLActive ),
@@ -567,7 +567,7 @@ sal_Bool IMapPolygonObject::IsEqual( const IMapPolygonObject& rEqObj )
 |*
 \******************************************************************************/
 
-ImageMap::ImageMap( const String& rName )
+ImageMap::ImageMap( const OUString& rName )
 :   aName( rName )
 {
 }
@@ -869,7 +869,7 @@ void ImageMap::Scale( const Fraction& rFracX, const Fraction& rFracY )
 |*
 \******************************************************************************/
 
-void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const
+void ImageMap::ImpWriteImageMap( SvStream& rOStm, const OUString& rBaseURL ) const
 {
     IMapObject* pObj;
     size_t      nCount = maList.size();
@@ -888,7 +888,7 @@ void ImageMap::ImpWriteImageMap( SvStream& rOStm, const String& rBaseURL ) const
 |*
 \******************************************************************************/
 
-void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const String& rBaseURL )
+void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& rBaseURL )
 {
     // neue Objekte einlesen
     for ( size_t i = 0; i < nCount; i++ )
@@ -937,7 +937,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount, const String& rB
 |*
 \******************************************************************************/
 
-void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
+void ImageMap::Write( SvStream& rOStm, const OUString& rBaseURL ) const
 {
     IMapCompat*             pCompat;
     String                  aImageName( GetName() );
@@ -973,7 +973,7 @@ void ImageMap::Write( SvStream& rOStm, const String& rBaseURL ) const
 |*
 \******************************************************************************/
 
-void ImageMap::Read( SvStream& rIStm, const String& rBaseURL )
+void ImageMap::Read( SvStream& rIStm, const OUString& rBaseURL )
 {
     char        cMagic[6];
     sal_uInt16      nOldFormat = rIStm.GetNumberFormatInt();
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index bec3886d0db1..f9ff161bc997 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -60,18 +60,18 @@ void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) c
     rBuf.append(' ');
 }
 
-void IMapObject::AppendCERNURL(OStringBuffer& rBuf, const String& rBaseURL) const
+void IMapObject::AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const
 {
     rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
 }
 
-void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const String& rBaseURL) const
+void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const OUString& rBaseURL) const
 {
     rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding()));
     rBuf.append(' ');
 }
 
-void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
+void IMapRectangleObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
 {
     OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rectangle "));
 
@@ -82,7 +82,7 @@ void IMapRectangleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) c
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
 
-void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
+void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
 {
     OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("rect "));
 
@@ -93,7 +93,7 @@ void IMapRectangleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) c
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
 
-void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) const
+void IMapCircleObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
 {
     OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
 
@@ -105,7 +105,7 @@ void IMapCircleObject::WriteCERN( SvStream& rOStm, const String& rBaseURL ) cons
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
 
-void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) const
+void IMapCircleObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const
 {
     OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("circle "));
 
@@ -116,7 +116,7 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) cons
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
 
-void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL  ) const
+void IMapPolygonObject::WriteCERN( SvStream& rOStm, const OUString& rBaseURL  ) const
 {
     OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("polygon "));
     const sal_uInt16 nCount = aPoly.GetSize();
@@ -129,7 +129,7 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm, const String& rBaseURL  ) co
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
 
-void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const
+void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const OUString& rBaseURL  ) const
 {
     OStringBuffer aStrBuf(RTL_CONSTASCII_STRINGPARAM("poly "));
     const sal_uInt16 nCount = std::min( aPoly.GetSize(), (sal_uInt16) 100 );
@@ -142,7 +142,7 @@ void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL  ) co
     rOStm.WriteLine(aStrBuf.makeStringAndClear());
 }
 
-void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL ) const
+void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const OUString& rBaseURL ) const
 {
     switch( nFormat )
     {
@@ -155,7 +155,7 @@ void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL
     }
 }
 
-void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
+void ImageMap::ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const
 {
     IMapObject* pObj;
     size_t      nCount = maList.size();
@@ -184,7 +184,7 @@ void ImageMap::ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const
     }
 }
 
-void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const
+void ImageMap::ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL  ) const
 {
     IMapObject* pObj;
     size_t      nCount = maList.size();
@@ -213,7 +213,7 @@ void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL  ) const
     }
 }
 
-sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const String& rBaseURL  )
+sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const OUString& rBaseURL  )
 {
     sal_uLong nRet = IMAP_ERR_FORMAT;
 
@@ -236,7 +236,7 @@ sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const String& rBas
     return nRet;
 }
 
-sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
+sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const OUString& rBaseURL )
 {
     // alten Inhalt loeschen
     ClearImageMap();
@@ -248,7 +248,7 @@ sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL )
     return IMAP_ERR_OK;
 }
 
-void ImageMap::ImpReadCERNLine( const OString& rLine, const String& rBaseURL  )
+void ImageMap::ImpReadCERNLine( const OString& rLine, const OUString& rBaseURL  )
 {
     OString aStr = comphelper::string::stripStart(rLine, ' ');
     aStr = comphelper::string::stripStart(aStr, '\t');
@@ -366,7 +366,7 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr )
     return aStr.ToInt32();
 }
 
-String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL )
+OUString ImageMap::ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL )
 {
     OUString aStr(OUString::createFromAscii(*ppStr));
 
@@ -378,7 +378,7 @@ String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL )
     return INetURLObject::GetAbsURL( rBaseURL, aStr );
 }
 
-sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
+sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const OUString& rBaseURL )
 {
     // alten Inhalt loeschen
     ClearImageMap();
@@ -390,7 +390,7 @@ sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL )
     return IMAP_ERR_OK;
 }
 
-void ImageMap::ImpReadNCSALine( const OString& rLine, const String& rBaseURL )
+void ImageMap::ImpReadNCSALine( const OString& rLine, const OUString& rBaseURL )
 {
     OString aStr = comphelper::string::stripStart(rLine, ' ');
     aStr = comphelper::string::stripStart(aStr, '\t');
@@ -448,7 +448,7 @@ void ImageMap::ImpReadNCSALine( const OString& rLine, const String& rBaseURL )
     }
 }
 
-String ImageMap::ImpReadNCSAURL( const char** ppStr, const String& rBaseURL )
+OUString ImageMap::ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL )
 {
     String  aStr;
     char    cChar = *(*ppStr)++;
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 75568eed887d..9afd1199314c 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -612,7 +612,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
     if( RTL_TEXTENCODING_DONTKNOW == eDestEnc )
         eDestEnc = osl_getThreadTextEncoding();
 
-    const String& rOutName = rName.Len() ? rName : rIMap.GetName();
+    const String& rOutName = rName.Len() ? rName : String(rIMap.GetName());
     DBG_ASSERT( rOutName.Len(), "Kein ImageMap-Name" );
     if( !rOutName.Len() )
         return rStream;
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index fa630b2ecac2..78f792f01566 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1571,11 +1571,11 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, String* pURL,
             if ( rURL.GetMap() )
             {
                 IMapObject *pObject = pFly->GetFmt()->GetIMapObject( rPt, pFly );
-                if ( pObject && pObject->GetURL().Len() )
+                if ( pObject && !pObject->GetURL().isEmpty() )
                 {
                     if( pURL )
                         *pURL = pObject->GetURL();
-                    if ( bSetTargetFrameName && pObject->GetTarget().Len() )
+                    if ( bSetTargetFrameName && !pObject->GetTarget().isEmpty() )
                     {
                         bSetTargetFrameName = false;
                         *pTargetFrameName = pObject->GetTarget();