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

Change-Id: I612c4f99349eea8efceb5cd83a2533f478b74d39

6 files changed, 31 insertions, 30 deletions

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 50ba16c6aa1d..651656ed490d 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2516,12 +2516,12 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 // replace the word or abbreviation with the auto text
                 rSh.StartUndo( UNDO_START );
 
-                String sFnd( aTmpQHD.m_aHelpStrings[ aTmpQHD.nCurArrPos ] );
+                OUString sFnd( aTmpQHD.m_aHelpStrings[ aTmpQHD.nCurArrPos ] );
                 if( aTmpQHD.m_bIsAutoText )
                 {
                     SwGlossaryList* pList = ::GetGlossaryList();
-                    String sShrtNm;
-                    String sGroup;
+                    OUString sShrtNm;
+                    OUString sGroup;
                     if(pList->GetShortName( sFnd, sShrtNm, sGroup))
                     {
                         rSh.SttSelect();
@@ -2534,7 +2534,8 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 }
                 else
                 {
-                    rSh.Insert( sFnd.Erase( 0, aTmpQHD.nLen ));
+                    sFnd = sFnd.copy( aTmpQHD.nLen );
+                    rSh.Insert( sFnd );
                     m_pQuickHlpData->m_bAppendSpace = !pACorr ||
                             pACorr->GetSwFlags().bAutoCmpltAppendBlanc;
                 }
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx
index c943d8fa732e..e1c95a46788a 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/ui/inc/glosbib.hxx
@@ -52,9 +52,9 @@ public:
 
 struct GlosBibUserData
 {
-    String sPath;
-    String sGroupName;
-    String sGroupTitle;
+    OUString sPath;
+    OUString sGroupName;
+    OUString sGroupTitle;
 };
 
 class SwGlossaryGroupTLB : public SvTabListBox
@@ -90,7 +90,7 @@ class SwGlossaryGroupDlg : public SvxStandardDialog
 
     SwGlossaryHdl   *pGlosHdl;
 
-    String          sCreatedGroup;
+    OUString        sCreatedGroup;
 
     sal_Bool            IsDeleteAllowed(const OUString &rGroup);
 
@@ -108,7 +108,7 @@ public:
                         SwGlossaryHdl *pGlosHdl);
     ~SwGlossaryGroupDlg();
 
-    const String&       GetCreatedGroupName() const {return sCreatedGroup;}
+    const OUString&     GetCreatedGroupName() const {return sCreatedGroup;}
 };
 
 #endif
diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx
index 1c83e7d43fd1..8c9fca86bb3c 100644
--- a/sw/source/ui/inc/gloslst.hxx
+++ b/sw/source/ui/inc/gloslst.hxx
@@ -57,8 +57,8 @@ public:
         ~SwGlossaryList();
 
     bool HasLongName(const OUString& rBegin, std::vector<OUString> *pLongNames);
-    sal_Bool            GetShortName(const String& rLongName,
-                                        String& rShortName, String& rGroupName );
+    sal_Bool            GetShortName(const OUString& rLongName,
+                                        OUString& rShortName, OUString& rGroupName );
 
     sal_uInt16      GetGroupCount();
     OUString        GetGroupName(sal_uInt16 nPos, bool bNoPath = true);
diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/ui/inc/glshell.hxx
index abe5fac02bad..48b8a8c3fe3f 100644
--- a/sw/source/ui/inc/glshell.hxx
+++ b/sw/source/ui/inc/glshell.hxx
@@ -22,9 +22,9 @@
 
 class SwGlosDocShell : public SwDocShell
 {
-    String          aLongName;
-    String          aShortName;
-    String          aGroupName;
+    OUString          aLongName;
+    OUString          aShortName;
+    OUString          aGroupName;
 
     using SotObject::GetInterface;
 
@@ -41,21 +41,21 @@ public:
 
     void            Execute( SfxRequest& );
     void            GetState( SfxItemSet& );
-    void            SetLongName( const String& rLongName )
+    void            SetLongName( const OUString& rLongName )
                         { aLongName = rLongName; }
-    void            SetShortName( const String& rShortName )
+    void            SetShortName( const OUString& rShortName )
                         { aShortName = rShortName; }
-    void            SetGroupName( const String& rGroupName )
+    void            SetGroupName( const OUString& rGroupName )
                         { aGroupName = rGroupName; }
-    const String&   GetShortName(){return aShortName;}
+    const OUString& GetShortName(){return aShortName;}
 };
 
 
 class SwWebGlosDocShell : public SwWebDocShell
 {
-    String          aLongName;
-    String          aShortName;
-    String          aGroupName;
+    OUString          aLongName;
+    OUString          aShortName;
+    OUString          aGroupName;
 
     using SotObject::GetInterface;
 
@@ -72,13 +72,13 @@ public:
 
     void            Execute( SfxRequest& );
     void            GetState( SfxItemSet& );
-    void            SetLongName( const String& rLongName )
+    void            SetLongName( const OUString& rLongName )
                         { aLongName = rLongName; }
-    void            SetShortName( const String& rShortName )
+    void            SetShortName( const OUString& rShortName )
                         { aShortName = rShortName; }
-    void            SetGroupName( const String& rGroupName )
+    void            SetGroupName( const OUString& rGroupName )
                         { aGroupName = rGroupName; }
-    const String&   GetShortName(){return aShortName;}
+    const OUString& GetShortName(){return aShortName;}
 };
 
 #endif
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 0ec6d7fe5b17..a08a6211768d 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -170,7 +170,7 @@ void SwGlossaryGroupDlg::Apply()
         if( sNewGroup != aActGroup )
         {
             pGlosHdl->NewGroup(sNewGroup, sNewTitle);
-            if(!sCreatedGroup.Len())
+            if(sCreatedGroup.isEmpty())
                 sCreatedGroup = sNewGroup;
         }
     }
@@ -437,7 +437,7 @@ void    SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt )
             GlosBibUserData* pData = (GlosBibUserData*)pEntry->GetUserData();
             sMsg = pData->sPath;
             sMsg += INET_PATH_TOKEN;
-            sMsg += pData->sGroupName.GetToken(0, GLOS_DELIM);
+            sMsg += pData->sGroupName.getToken(0, GLOS_DELIM);
             sMsg += SwGlossaries::GetExtension();
 
             Help::ShowQuickHelp( this, aItemRect, sMsg,
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/ui/utlui/gloslst.cxx
index 37ef6eb9b87f..24d4691903a6 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/ui/utlui/gloslst.cxx
@@ -103,8 +103,8 @@ SwGlossaryList::~SwGlossaryList()
 // will be filled. Otherwise also rGroupName will be set and
 // on demand asked for the right group.
 
-sal_Bool SwGlossaryList::GetShortName(const String& rLongName,
-                                String& rShortName, String& rGroupName )
+sal_Bool SwGlossaryList::GetShortName(const OUString& rLongName,
+                                OUString& rShortName, OUString& rGroupName )
 {
     if(!bFilled)
         Update();
@@ -116,7 +116,7 @@ sal_Bool SwGlossaryList::GetShortName(const String& rLongName,
     for(sal_uInt16 i = 0; i < nCount; i++ )
     {
         AutoTextGroup* pGroup = aGroupArr[i];
-        if(rGroupName.Len() && rGroupName != pGroup->sName)
+        if(!rGroupName.isEmpty() && rGroupName != pGroup->sName)
             continue;
 
         for(sal_uInt16 j = 0; j < pGroup->nCount; j++)