convert sw/source/ui/docvw/*.hxx from String to OUString

Change-Id: I8b8437b4020d84402b6b16140b7c999e6c88efb1

5 files changed, 18 insertions, 18 deletions

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index b1b5a1194fd0..0e80c84cd907 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -430,9 +430,9 @@ public:
                     sal_Bool bSelFrame = sal_True );
 
     /// Position is a graphic with URL?
-    const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, String* pURL = 0,
-                                    String *pTargetFrameName = 0,
-                                    String *pURLDescription = 0 ) const;
+    const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0,
+                                    OUString *pTargetFrameName = 0,
+                                    OUString *pURLDescription = 0 ) const;
 
     /** For Chain always connect Fly specified by format with that hit by point.
      rRect contains rect of Fly (for its highlight). */
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index f5d766855c3e..02dc217bb161 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1544,9 +1544,9 @@ String SwFEShell::GetUniqueGrfName() const
     return GetDoc()->GetUniqueGrfName();
 }
 
-const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, String* pURL,
-                                        String *pTargetFrameName,
-                                        String *pDescription ) const
+const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, OUString* pURL,
+                                        OUString *pTargetFrameName,
+                                        OUString *pDescription ) const
 {
     if( !Imp()->HasDrawView() )
         return 0;
@@ -1601,8 +1601,8 @@ const SwFrmFmt* SwFEShell::IsURLGrfAtPos( const Point& rPt, String* pURL,
                         // without MapMode-Offset, without Offset, o ... !!!!!
                         aPt = GetOut()->LogicToPixel(
                                 aPt, MapMode( MAP_TWIP ) );
-                        ((( *pURL += '?' ) += OUString::number( aPt.getX() ))
-                                  += ',' ) += OUString::number(aPt.getY() );
+                        ((( *pURL += "?" ) += OUString::number( aPt.getX() ))
+                                  += "," ) += OUString::number(aPt.getY() );
                     }
                 }
                 pRet = pFly->GetFmt();
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 3717572fcf70..f478471f9d11 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -91,7 +91,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     bGrfToGalleryAsLnk = SW_MOD()->GetModuleConfig()->IsGrfToGalleryAsLnk();
     SwWrtShell &rSh = rView.GetWrtShell();
     rSh.IsURLGrfAtPos( rDocPos, &sURL, &sTargetFrameName, &sDescription );
-    if ( !sURL.Len() )
+    if ( sURL.isEmpty() )
     {
         SwContentAtPos aCntntAtPos( SwContentAtPos::SW_INETATTR );
         if( rSh.GetContentAtPos( rDocPos, aCntntAtPos, sal_False))
@@ -216,7 +216,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     }
     delete pState;
 
-    if ( !sURL.Len() )
+    if ( sURL.isEmpty() )
     {
         EnableItem( MN_READONLY_OPENURL, sal_False );
         EnableItem( MN_READONLY_OPENURLNEW, sal_False );
@@ -344,7 +344,7 @@ void SwReadOnlyPopup::Execute( Window* pWin, sal_uInt16 nId )
     }
 }
 
-String SwReadOnlyPopup::SaveGraphic( sal_uInt16 nId )
+OUString SwReadOnlyPopup::SaveGraphic( sal_uInt16 nId )
 {
     // fish out the graphic's name
     if ( MN_READONLY_SAVEBACKGROUND == nId )
@@ -360,7 +360,7 @@ String SwReadOnlyPopup::SaveGraphic( sal_uInt16 nId )
                 sGrfName = pItem->GetGraphicLink();
         }
         else
-            return aEmptyStr;
+            return OUString();
     }
     return GraphicHelper::ExportGraphic( aGraphic, sGrfName );
 }
diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/ui/docvw/romenu.hxx
index a62c65315567..3cb1d569771c 100644
--- a/sw/source/ui/docvw/romenu.hxx
+++ b/sw/source/ui/docvw/romenu.hxx
@@ -35,7 +35,7 @@ class SwReadOnlyPopup : public PopupMenu
     const SvxBrushItem *pItem;
     const Point &rDocPos;
                 Graphic aGraphic;
-    String      sURL,
+    OUString    sURL,
                 sTargetFrameName,
                 sDescription;
     OUString    sGrfName;
@@ -45,7 +45,7 @@ class SwReadOnlyPopup : public PopupMenu
     INetImage*  pTargetURL;
 
     void Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher &rDis );
-    String SaveGraphic( sal_uInt16 nId );
+    OUString SaveGraphic( sal_uInt16 nId );
 
     using PopupMenu::Execute;
 
@@ -57,7 +57,7 @@ public:
     void Execute( Window* pWin, sal_uInt16 nId );
 };
 
-void GetPreferedExtension( String &rExt, const Graphic &rGrf );
+void GetPreferedExtension( OUString &rExt, const Graphic &rGrf );
 
 #endif
 
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 8b39288554ca..ad9fc2c0370a 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -336,10 +336,10 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter
 bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter )
 {
     bool bRet = false;
-    String sURL;
-    String sTargetFrameName;
+    OUString sURL;
+    OUString sTargetFrameName;
     const SwFrmFmt* pFnd = IsURLGrfAtPos( rDocPt, &sURL, &sTargetFrameName );
-    if( pFnd && sURL.Len() )
+    if( pFnd && !sURL.isEmpty() )
     {
         bRet = true;
         // At first run the possibly set ObjectSelect Macro