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

Change-Id: I276fdfe7ddd6cc0daa0ca7d6f51342fea718af8e

sw/source/ui/dialog/uiregionsw.cxx

@@ -539,7 +539,7 @@ SwEditRegionDlg::~SwEditRegionDlg( )
     delete m_pDocInserter;
 }
 
-void    SwEditRegionDlg::SelectSection(const String& rSectionName)
+void    SwEditRegionDlg::SelectSection(const OUString& rSectionName)
 {
     SvTreeListEntry* pEntry = m_pTree->First();
     while(pEntry)
@@ -1604,7 +1604,7 @@ void    SwInsertSectionTabPage::SetWrtShell(SwWrtShell& rSh)
         m_pProtectCB->Check( 0 != pSectionData->IsProtectFlag() );
         m_sFileName = pSectionData->GetLinkFileName();
         m_sFilePasswd = pSectionData->GetLinkFilePassword();
-        m_pFileCB->Check( 0 != m_sFileName.Len() );
+        m_pFileCB->Check( !m_sFileName.isEmpty() );
         m_pFileNameED->SetText( m_sFileName );
         UseFileHdl(m_pFileCB);
     }

sw/source/ui/inc/redlndlg.hxx

@@ -45,8 +45,8 @@ struct SwRedlineDataParent
 {
     const SwRedlineData*        pData;      // RedlineDataPtr
     const SwRedlineDataChild*   pNext;      // link to stacked data
-    SvTreeListEntry*                pTLBParent; // corresponding TreeListBox entry
-    String                      sComment;   // redline comment
+    SvTreeListEntry*            pTLBParent; // corresponding TreeListBox entry
+    OUString                    sComment;   // redline comment
 
     inline sal_Bool operator==( const SwRedlineDataParent& rObj ) const
                         { return (pData && pData->GetSeqNo() == rObj.pData->GetSeqNo()); }
@@ -76,13 +76,13 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     PopupMenu               aPopup;
     Timer                   aDeselectTimer;
     Timer                   aSelectTimer;
-    String                  sInserted;
-    String                  sDeleted;
-    String                  sFormated;
-    String                  sTableChgd;
-    String                  sFmtCollSet;
-    String                  sFilterAction;
-    String                  sAutoFormat;
+    OUString                sInserted;
+    OUString                sDeleted;
+    OUString                sFormated;
+    OUString                sTableChgd;
+    OUString                sFmtCollSet;
+    OUString                sFilterAction;
+    OUString                sAutoFormat;
     SvxTPView*              pTPView;
     SvxRedlinTable*         pTable; // PB 2006/02/02 #i48648 now SvHeaderTabListBox
     Link                    aOldSelectHdl;
@@ -110,9 +110,9 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     SW_DLLPRIVATE void          RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd);
     SW_DLLPRIVATE void          InitAuthors();
 
-    SW_DLLPRIVATE String            GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, sal_uInt16 nStack = 0);
-    SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, sal_uInt16 nStack = 0);
-    SW_DLLPRIVATE sal_uInt16            GetRedlinePos( const SvTreeListEntry& rEntry) const;
+    SW_DLLPRIVATE OUString      GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, sal_uInt16 nStack = 0);
+    SW_DLLPRIVATE OUString      GetActionText(const SwRedline& rRedln, sal_uInt16 nStack = 0);
+    SW_DLLPRIVATE sal_uInt16    GetRedlinePos( const SvTreeListEntry& rEntry) const;
 
 public:
     SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt = sal_False);
@@ -126,7 +126,7 @@ public:
     void            Init(sal_uInt16 nStart = 0);
     void            CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept );
 
-    void            Initialize(const String &rExtraData);
+    void            Initialize(const OUString &rExtraData);
     void            FillInfo(OUString &rExtraData) const;
 
     virtual void    Activate();

sw/source/ui/inc/regionsw.hxx

@@ -135,7 +135,7 @@ public:
     SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh );
     virtual ~SwEditRegionDlg();
 
-    void    SelectSection(const String& rSectionName);
+    void    SelectSection(const OUString& rSectionName);
 
 };
 
@@ -166,9 +166,9 @@ class SwInsertSectionTabPage : public SfxTabPage
     // #114856# edit in readonly sections
     CheckBox*       m_pEditInReadonlyCB;
 
-    String          m_sFileName;
-    String          m_sFilterName;
-    String          m_sFilePasswd;
+    OUString        m_sFileName;
+    OUString        m_sFilterName;
+    OUString        m_sFilePasswd;
 
     ::com::sun::star::uno::Sequence <sal_Int8 > m_aNewPasswd;
     SwWrtShell*             m_pWrtSh;

sw/source/ui/misc/redlndlg.cxx

@@ -312,26 +312,26 @@ void SwRedlineAcceptDlg::InitAuthors()
                                 !bOnlyFormatedRedlines );
 }
 
-String SwRedlineAcceptDlg::GetRedlineText( const SwRedline& rRedln,
+OUString SwRedlineAcceptDlg::GetRedlineText( const SwRedline& rRedln,
                                         DateTime &rDateTime, sal_uInt16 nStack)
 {
-    String sEntry(GetActionText(rRedln, nStack));
-    sEntry += '\t';
+    OUString sEntry(GetActionText(rRedln, nStack));
+    sEntry += "\t";
     sEntry += rRedln.GetAuthorString(nStack);
-    sEntry += '\t';
+    sEntry += "\t";
 
     const DateTime &rDT = rRedln.GetTimeStamp(nStack);
     rDateTime = rDT;
 
     sEntry += GetAppLangDateTimeString( rDT );
-    sEntry += '\t';
+    sEntry += "\t";
 
     sEntry += rRedln.GetComment(nStack);
 
     return sEntry;
 }
 
-const String &SwRedlineAcceptDlg::GetActionText(const SwRedline& rRedln, sal_uInt16 nStack)
+OUString SwRedlineAcceptDlg::GetActionText(const SwRedline& rRedln, sal_uInt16 nStack)
 {
     switch( rRedln.GetType(nStack) )
     {
@@ -343,7 +343,7 @@ const String &SwRedlineAcceptDlg::GetActionText(const SwRedline& rRedln, sal_uIn
         default:;//prevent warning
     }
 
-    return aEmptyStr;
+    return OUString();
 }
 
 /*--------------------------------------------------------------------
@@ -534,8 +534,8 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRe
     const SwRedlineData *pRedlineData = &rRedln.GetRedlineData();
     bool bAutoFmt = (rRedln.GetRealType() & nAutoFmt) != 0;
 
-    const String *pAction = &GetActionText(rRedln);
-    sal_Bool bValidParent = !sFilterAction.Len() || sFilterAction == *pAction;
+    OUString sAction = GetActionText(rRedln);
+    sal_Bool bValidParent = sFilterAction.isEmpty() || sFilterAction == sAction;
     bValidParent = bValidParent && pTable->IsValidEntry(rRedln.GetAuthorString(), rRedln.GetTimeStamp(), rRedln.GetComment());
     if (nAutoFmt)
     {
@@ -573,8 +573,8 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRe
         else
             pParent->pNext = pRedlineChild;
 
-        pAction = &GetActionText(rRedln, nStack);
-        sal_Bool bValidChild = !sFilterAction.Len() || sFilterAction == *pAction;
+        sAction = GetActionText(rRedln, nStack);
+        sal_Bool bValidChild = sFilterAction.isEmpty() || sFilterAction == sAction;
         bValidChild = bValidChild && pTable->IsValidEntry(rRedln.GetAuthorString(nStack), rRedln.GetTimeStamp(nStack), rRedln.GetComment());
         if (nAutoFmt)
             bValidChild = bValidChild && bAutoFmt;
@@ -1156,24 +1156,24 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
     return 0;
 }
 
-void SwRedlineAcceptDlg::Initialize(const String& rExtraData)
+void SwRedlineAcceptDlg::Initialize(const OUString& rExtraData)
 {
-    if (rExtraData.Len())
+    if (!rExtraData.isEmpty())
     {
-        sal_uInt16 nPos = rExtraData.Search(OUString("AcceptChgDat:"));
+        sal_Int32 nPos = rExtraData.indexOf("AcceptChgDat:");
 
         // try to read the alignment string "ALIGN:(...)"; if none existing,
         // it's an old version
-        if (nPos != STRING_NOTFOUND)
+        if (nPos != -1)
         {
-            sal_uInt16 n1 = rExtraData.Search('(', nPos);
-            if (n1 != STRING_NOTFOUND)
+            sal_Int32 n1 = rExtraData.indexOf('(', nPos);
+            if (n1 != -1)
             {
-                sal_uInt16 n2 = rExtraData.Search(')', n1);
-                if (n2 != STRING_NOTFOUND)
+                sal_Int32 n2 = rExtraData.indexOf(')', n1);
+                if (n2 != -1)
                 {
                     // cut out the alignment string
-                    String aStr = rExtraData.Copy(nPos, n2 - nPos + 1);
+                    String aStr = rExtraData.copy(nPos, n2 - nPos + 1);
                     aStr.Erase(0, n1 - nPos + 1);
 
                     if (aStr.Len())