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

Change-Id: Ic5d034cdc013910f932d1126204c362a269018b0

5 files changed, 16 insertions, 16 deletions

diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/ui/inc/navicont.hxx
index dd8865f8c117..1cfc81a36459 100644
--- a/sw/source/ui/inc/navicont.hxx
+++ b/sw/source/ui/inc/navicont.hxx
@@ -32,19 +32,19 @@ class TransferableDataHelper;
 
 class NaviContentBookmark
 {
-    String          aUrl;       // URL including jump mark
-    String          aDescr;     // description
+    OUString        aUrl;       // URL including jump mark
+    OUString        aDescr;     // description
     long            nDocSh;     // address of DocShell
     sal_uInt16          nDefDrag;   // description contains defaultDragType
 
 public:
     NaviContentBookmark();
-    NaviContentBookmark( const String &rUrl, const String& rDesc,
+    NaviContentBookmark( const OUString &rUrl, const OUString& rDesc,
                             sal_uInt16 nDragType, const SwDocShell* );
 
-    const String&   GetURL() const              { return aUrl; }
-    const String&   GetDescription() const      { return aDescr; }
-    sal_uInt16          GetDefaultDragType() const  { return nDefDrag; }
+    const OUString& GetURL() const              { return aUrl; }
+    const OUString& GetDescription() const      { return aDescr; }
+    sal_uInt16      GetDefaultDragType() const  { return nDefDrag; }
     void            Copy( TransferDataContainer& rData ) const;
     sal_Bool            Paste( TransferableDataHelper& rData );
 };
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx
index 0fb4bd0f3e23..b9a73aa47eb1 100644
--- a/sw/source/ui/inc/navipi.hxx
+++ b/sw/source/ui/inc/navipi.hxx
@@ -65,9 +65,9 @@ class SwNavigationPI : public Window,
     SwGlobalTree        aGlobalTree;
     ListBox             aDocListBox;
     Timer               aPageChgTimer;
-    String              sContentFileName;
-    String              aContextArr[3];
-    String              aStatusArr[4];
+    OUString            sContentFileName;
+    OUString            aContextArr[3];
+    OUString            aStatusArr[4];
     Point               aBoxBottomLeft; // Pos when Box is at bottom
 
     SfxObjectShellLock  *pxObjectShell;
@@ -155,7 +155,7 @@ public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                             const SfxPoolItem* pState );
 
-    static String   CreateDropFileName( TransferableDataHelper& rData );
+    static OUString CreateDropFileName( TransferableDataHelper& rData );
     static OUString CleanEntry(const OUString& rEntry);
 
     sal_uInt16          GetRegionDropMode() const {return nRegionMode;}
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 5ab946ec4076..9782db319eaf 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -3028,8 +3028,8 @@ NaviContentBookmark::NaviContentBookmark()
 {
 }
 
-NaviContentBookmark::NaviContentBookmark( const String &rUrl,
-                    const String& rDesc,
+NaviContentBookmark::NaviContentBookmark( const OUString &rUrl,
+                    const OUString& rDesc,
                     sal_uInt16 nDragType,
                     const SwDocShell* pDocSh ) :
     aUrl( rUrl ),
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 45a53174b9fc..90743058ea3b 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -1142,7 +1142,7 @@ IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem)
     return 0;
 }
 
-String SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
+OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
 {
     OUString sFileName;
     sal_uLong nFmt;
@@ -1201,7 +1201,7 @@ sal_Int8 SwNavigationPI::ExecuteDrop( const ExecuteDropEvent& rEvt )
         if( !aDesc.Detect() )   // accept no graphics
         {
             if( STRING_NOTFOUND == sFileName.Search('#')
-                && (!sContentFileName.Len() || sContentFileName != sFileName ))
+                && (sContentFileName.isEmpty() || sContentFileName != sFileName ))
             {
                 nRet = rEvt.mnAction;
                 sFileName = comphelper::string::stripEnd(sFileName, 0);
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 2e91b1368cd1..8b39288554ca 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -444,10 +444,10 @@ void SwWrtShell::NavigatorPaste( const NaviContentBookmark& rBkmk,
     else
     {
         SwSectionData aSection( FILE_LINK_SECTION, GetUniqueSectionName() );
-        String aLinkFile( rBkmk.GetURL().GetToken(0, '#') );
+        String aLinkFile( rBkmk.GetURL().getToken(0, '#') );
         aLinkFile += sfx2::cTokenSeparator;
         aLinkFile += sfx2::cTokenSeparator;
-        aLinkFile += rBkmk.GetURL().GetToken(1, '#');
+        aLinkFile += rBkmk.GetURL().getToken(1, '#');
         aSection.SetLinkFileName( aLinkFile );
         aSection.SetProtectFlag( true );
         const SwSection* pIns = InsertSection( aSection );