convert sw/source/ui/fldui/*.cxx from String to OUString

Change-Id: Ibe97d7968eb8375fd3b9bd3c0c9148084b37a9f8

12 files changed, 94 insertions, 93 deletions

diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index fdebcbb6aa6a..ea83cf70fb67 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -56,7 +56,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS,
     {
         //
         pDropField = (SwDropDownField*)pField;
-        String sTitle = GetText();
+        OUString sTitle = GetText();
         sTitle += pDropField->GetPar2();
         SetText(sTitle);
         uno::Sequence< OUString > aItems = pDropField->GetItemSequence();
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx
index f96131f3c46a..1bb07a7bec3e 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.cxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx
@@ -47,7 +47,7 @@ void SwFldRefTreeListBox::RequestHelp( const HelpEvent& rHEvt )
         SvTreeListEntry* pEntry = GetEntry( aPos );
         if( pEntry )
         {
-            String sEntry( GetEntryText( pEntry ) );
+            OUString sEntry( GetEntryText( pEntry ) );
             SvLBoxTab* pTab;
             SvLBoxItem* pItem = GetItem( pEntry, aPos.X(), &pTab );
             if( pItem )
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 5afc7af863de..d53463bd8f76 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -95,8 +95,8 @@ void SwChangeDBDlg::FillDBPopup()
     Reference<XDatabaseContext> xDBContext = DatabaseContext::create(xContext);
 
     const SwDBData& rDBData = pSh->GetDBData();
-    String sDBName(rDBData.sDataSource);
-    String sTableName(rDBData.sCommand);
+    OUString sDBName(rDBData.sDataSource);
+    OUString sTableName(rDBData.sCommand);
     m_pAvailDBTLB->Select(sDBName, sTableName, aEmptyStr);
 
     std::vector<OUString> aAllDBNames;
@@ -120,7 +120,7 @@ void SwChangeDBDlg::FillDBPopup()
     for(size_t k = 0; k < nCount; k++)
     {
         sDBName = aDBNameList[k];
-        sDBName = sDBName.GetToken(0);
+        sDBName = sDBName.getToken(0, ';');
         pLast = Insert(sDBName);
         if (!pFirst)
             pFirst = pLast;
@@ -136,8 +136,8 @@ void SwChangeDBDlg::FillDBPopup()
 
 SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName)
 {
-    String sDBName(rDBName.getToken(0, DB_DELIM));
-    String sTableName(rDBName.getToken(1, DB_DELIM));
+    OUString sDBName(rDBName.getToken(0, DB_DELIM));
+    OUString sTableName(rDBName.getToken(1, DB_DELIM));
     sal_IntPtr nCommandType = rDBName.getToken(2, DB_DELIM).toInt32();
     SvTreeListEntry* pParent;
     SvTreeListEntry* pChild;
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 8417b19d7072..c359e716a126 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -286,7 +286,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
         if (IsFldEdit())
         {
             SwDBData aData;
-            String sColumnName;
+            OUString sColumnName;
             if (nTypeId == TYP_DBFLD)
             {
                 aData = ((SwDBField*)GetCurField())->GetDBData();
@@ -462,8 +462,8 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox )
 
 IMPL_LINK_NOARG(SwFldDBPage, AddDBHdl)
 {
-    String sNewDB = SwNewDBMgr::LoadAndRegisterDataSource();
-    if(sNewDB.Len())
+    OUString sNewDB = SwNewDBMgr::LoadAndRegisterDataSource();
+    if(!sNewDB.isEmpty())
     {
         m_pDatabaseTLB->AddDataSource(sNewDB);
     }
@@ -481,8 +481,8 @@ IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl)
 
 void    SwFldDBPage::FillUserData()
 {
-    String sData(OUString(USER_DATA_VERSION));
-    sData += ';';
+    OUString sData(OUString(USER_DATA_VERSION));
+    sData += ";";
     sal_uInt16 nTypeSel = m_pTypeLB->GetSelectEntryPos();
 
     if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index f5bdf1df17c6..2dfcb30c4ba9 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -146,7 +146,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& )
 
                     if( rProperties.getLength() )
                     {
-                        pInfo = m_pTypeTLB->InsertEntry( String(SW_RES( STR_CUSTOM )) );
+                        pInfo = m_pTypeTLB->InsertEntry( OUString(SW_RES( STR_CUSTOM )) );
                         pInfo->SetUserData(reinterpret_cast<void*>(USHRT_MAX));
 
                         for (sal_Int32 n=0; n < rProperties.getLength(); n++)
@@ -464,8 +464,8 @@ sal_uInt16 SwFldDokInfPage::GetGroup()
 
 void    SwFldDokInfPage::FillUserData()
 {
-    String sData(OUString(USER_DATA_VERSION));
-    sData += ';';
+    OUString sData(USER_DATA_VERSION);
+    sData += ";";
     SvTreeListEntry* pEntry = m_pTypeTLB->FirstSelected();
     sal_uInt16 nTypeSel = pEntry ? sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX;
     sData += OUString::number( nTypeSel );
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 2d55dfeed771..b40f0d7f8290 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -257,7 +257,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
 
                         case TYP_AUTHORFLD:
                         {
-                            String sFmt(GetFldMgr().GetFormatStr(nTypeId, i));
+                            OUString sFmt(GetFldMgr().GetFormatStr(nTypeId, i));
                             nPos = m_pSelectionLB->InsertEntry(sFmt);
                             m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(i));
                             m_pSelectionLB->SelectEntry(GetFldMgr().GetFormatStr(nTypeId, GetCurField()->GetFormat()));
@@ -550,7 +550,7 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& )
         nTypeId = (sal_uInt16)(sal_uLong)m_pSelectionLB->GetEntryData(nPos);
     }
 
-    String aVal(m_pValueED->GetText());
+    OUString aVal(m_pValueED->GetText());
     sal_uLong nFormat = 0;
     sal_uInt16 nSubType = 0;
 
@@ -643,8 +643,8 @@ sal_uInt16 SwFldDokPage::GetGroup()
 
 void    SwFldDokPage::FillUserData()
 {
-    String sData(OUString(USER_DATA_VERSION));
-    sData += ';';
+    OUString sData(USER_DATA_VERSION);
+    sData += ";";
     sal_uInt16 nTypeSel = m_pTypeLB->GetSelectEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
         nTypeSel = USHRT_MAX;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 2fcfd61615cb..99bc62da0813 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -125,7 +125,7 @@ void SwFldFuncPage::Reset(const SfxItemSet& )
 
         if (nTypeId == TYP_MACROFLD)
         {
-            String sName(GetCurField()->GetPar1());
+            OUString sName(GetCurField()->GetPar1());
             GetFldMgr().SetMacroPath(sName);
         }
     }
@@ -400,7 +400,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl)
     if(pControl == m_pListAddPB ||
             (pControl == m_pListItemED && m_pListAddPB->IsEnabled()))
     {
-        String sEntry(m_pListItemED->GetText());
+        OUString sEntry(m_pListItemED->GetText());
         m_pListItemsLB->InsertEntry(sEntry);
         m_pListItemsLB->SelectEntry(sEntry);
     }
@@ -416,7 +416,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl)
         {
             if(nSelPos)
             {
-                String sEntry = m_pListItemsLB->GetSelectEntry();
+                OUString sEntry = m_pListItemsLB->GetSelectEntry();
                 m_pListItemsLB->RemoveEntry(nSelPos);
                 nSelPos--;
                 m_pListItemsLB->InsertEntry(sEntry, nSelPos);
@@ -427,7 +427,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl)
         {
             if(nSelPos < m_pListItemsLB->GetEntryCount() - 1)
             {
-                String sEntry = m_pListItemsLB->GetSelectEntry();
+                OUString sEntry = m_pListItemsLB->GetSelectEntry();
                 m_pListItemsLB->RemoveEntry(nSelPos);
                 nSelPos++;
                 m_pListItemsLB->InsertEntry(sEntry, nSelPos);
@@ -508,8 +508,8 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn )
     Window* pDefModalDlgParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( pBtn );
 
-    String sMacro(TurnMacroString(m_pNameED->GetText()));
-    while (sMacro.SearchAndReplace('.', ';') != STRING_NOTFOUND) ;
+    OUString sMacro(TurnMacroString(m_pNameED->GetText()));
+    sMacro = sMacro.replaceAll(".", ";");
 
     if (GetFldMgr().ChooseMacro(sMacro))
         UpdateSubType();
@@ -532,8 +532,8 @@ sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& )
     else
         nFormat = (sal_uLong)m_pFormatLB->GetEntryData((sal_uInt16)nFormat);
 
-    String aVal(m_pValueED->GetText());
-    String aName(m_pNameED->GetText());
+    OUString aVal(m_pValueED->GetText());
+    OUString aName(m_pNameED->GetText());
 
     switch(nTypeId)
     {
@@ -551,9 +551,7 @@ sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& )
             break;
 
         case TYP_CONDTXTFLD:
-            aVal = m_pCond1ED->GetText();
-            aVal += '|';
-            aVal += m_pCond2ED->GetText();
+            aVal = m_pCond1ED->GetText() + "|" + m_pCond2ED->GetText();
             break;
         case TYP_DROPDOWN :
         {
@@ -561,7 +559,7 @@ sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& )
             for(sal_uInt16 i = 0; i < m_pListItemsLB->GetEntryCount(); i++)
             {
                 if(i)
-                    aVal += DB_DELIM;
+                    aVal += OUString(DB_DELIM);
                 aVal += m_pListItemsLB->GetEntry(i);
             }
         }
@@ -592,7 +590,8 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro)
     if (!rMacro.isEmpty())
     {
         // reverse content of aName
-        String sTmp, sBuf;
+        OUString sTmp;
+        OUStringBuffer sBuf;
         sal_Int32 nPos = 0;
 
         for (sal_uInt16 i = 0; i < 4 && nPos != -1; i++)
@@ -602,11 +601,11 @@ OUString SwFldFuncPage::TurnMacroString(const OUString &rMacro)
             else
                 sTmp = rMacro.getToken(0, '.', nPos);
 
-            if( sBuf.Len() )
-                sTmp += '.';
-            sBuf.Insert( sTmp, 0 );
+            if( !sBuf.isEmpty() )
+                sTmp += ".";
+            sBuf.insert(0, sTmp);
         }
-        return sBuf;
+        return sBuf.makeStringAndClear();
     }
 
     return rMacro;
@@ -625,8 +624,8 @@ sal_uInt16 SwFldFuncPage::GetGroup()
 
 void    SwFldFuncPage::FillUserData()
 {
-    String sData(OUString(USER_DATA_VERSION));
-    sData += ';';
+    OUString sData(USER_DATA_VERSION);
+    sData += ";";
     sal_uInt16 nTypeSel = m_pTypeLB->GetSelectEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
         nTypeSel = USHRT_MAX;
@@ -638,8 +637,8 @@ void    SwFldFuncPage::FillUserData()
 
 IMPL_LINK_NOARG(SwFldFuncPage, ModifyHdl)
 {
-    String aName(m_pNameED->GetText());
-    const sal_uInt16 nLen = aName.Len();
+    OUString aName(m_pNameED->GetText());
+    const sal_uInt16 nLen = aName.getLength();
 
     sal_Bool bEnable = sal_True;
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 35d28caf23af..fe07e87f1c5b 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -183,8 +183,8 @@ sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUS
     {
         SwField *const pTmpFld = m_pCurFld->CopyField();
 
-        String sPar1(rPar1);
-        String sPar2(rPar2);
+        OUString sPar1(rPar1);
+        OUString sPar2(rPar2);
         switch( nTypeId )
         {
         case TYP_DATEFLD:
@@ -216,7 +216,7 @@ sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUS
                 aData.sDataSource = rPar1.getToken(0, DB_DELIM);
                 aData.sCommand = rPar1.getToken(1, DB_DELIM);
                 aData.nCommandType = rPar1.getToken(2, DB_DELIM).toInt32();
-                String sColumn = rPar1.getToken(3, DB_DELIM);
+                OUString sColumn = rPar1.getToken(3, DB_DELIM);
 
                 SwDBFieldType* pOldTyp = (SwDBFieldType*)pTmpFld->GetTyp();
                 SwDBFieldType* pTyp = (SwDBFieldType*)pSh->InsertFldType(
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 4173ec9c7a2f..5b5ea20e4e25 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl)
         if (IsFldEdit())
         {
             // select positions
-            String sName;
+            OUString sName;
             sal_uInt16 nFlag = 0;
 
             switch( GetCurField()->GetSubType() )
@@ -464,7 +464,7 @@ void SwFldRefPage::UpdateSubType()
     SwGetRefField* pRefFld = (SwGetRefField*)GetCurField();
     const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
-    String sOldSel;
+    OUString sOldSel;
     // #i83479#
     if ( m_pSelectionLB->IsVisible() )
     {
@@ -474,7 +474,7 @@ void SwFldRefPage::UpdateSubType()
             sOldSel = m_pSelectionLB->GetEntry(nSelectionSel);
         }
     }
-    if (IsFldEdit() && !sOldSel.Len())
+    if (IsFldEdit() && sOldSel.isEmpty())
         sOldSel = OUString::number( pRefFld->GetSeqNo() + 1 );
 
     m_pSelectionLB->SetUpdateMode(sal_False);
@@ -548,14 +548,14 @@ void SwFldRefPage::UpdateSubType()
                      GetSavedSelectedTxtNode() == maOutlineNodes[nOutlIdx] )
                 {
                     m_pSelectionToolTipLB->Select( pEntry );
-                    sOldSel.Erase();
+                    sOldSel = "";
                     bCertainTxtNodeSelected = true;
                 }
                 else if ( !bCertainTxtNodeSelected &&
                           GetSavedSelectedPos() == nOutlIdx )
                 {
                     m_pSelectionToolTipLB->Select( pEntry );
-                    sOldSel.Erase();
+                    sOldSel = "";
                 }
             }
         }
@@ -578,14 +578,14 @@ void SwFldRefPage::UpdateSubType()
                      GetSavedSelectedTxtNode() == maNumItems[nNumItemIdx]->GetTxtNode() )
                 {
                     m_pSelectionToolTipLB->Select( pEntry );
-                    sOldSel.Erase();
+                    sOldSel = "";
                     bCertainTxtNodeSelected = true;
                 }
                 else if ( !bCertainTxtNodeSelected &&
                           GetSavedSelectedPos() == nNumItemIdx )
                 {
                     m_pSelectionToolTipLB->Select( pEntry );
-                    sOldSel.Erase();
+                    sOldSel = "";
                 }
             }
         }
@@ -601,18 +601,18 @@ void SwFldRefPage::UpdateSubType()
                 SwSeqFldList aArr;
                 // old selection should be kept in non-edit mode
                 if(IsFldEdit())
-                    sOldSel.Erase();
+                    sOldSel = "";
 
                 sal_uInt16 nCnt = pType->GetSeqFldList( aArr );
                 for( sal_uInt16 n = 0; n < nCnt; ++n )
                 {
                     m_pSelectionLB->InsertEntry( aArr[ n ]->sDlgEntry );
-                    if (IsFldEdit() && !sOldSel.Len() &&
+                    if (IsFldEdit() && sOldSel.isEmpty() &&
                         aArr[ n ]->nSeqNo == pRefFld->GetSeqNo())
                         sOldSel = aArr[ n ]->sDlgEntry;
                 }
 
-                if (IsFldEdit() && !sOldSel.Len())
+                if (IsFldEdit() && sOldSel.isEmpty())
                     sOldSel = OUString::number( pRefFld->GetSeqNo() + 1);
             }
         }
@@ -670,7 +670,7 @@ void SwFldRefPage::UpdateSubType()
 
 sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
 {
-    String sOldSel;
+    OUString sOldSel;
 
     sal_uInt16 nFormatSel = m_pFormatLB->GetSelectEntryPos();
     if (nFormatSel != LISTBOX_ENTRY_NOTFOUND)
@@ -759,8 +759,8 @@ sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
 
 IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
 {
-    String aName(m_pNameED->GetText());
-    const sal_uInt16 nLen = aName.Len();
+    OUString aName(m_pNameED->GetText());
+    const sal_uInt16 nLen = aName.getLength();
 
     sal_Bool bEnable = sal_True;
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
@@ -792,8 +792,8 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& )
     else
         nFormat = (sal_uLong)m_pFormatLB->GetEntryData((sal_uInt16)nFormat);
 
-    String aVal(m_pValueED->GetText());
-    String aName(m_pNameED->GetText());
+    OUString aVal(m_pValueED->GetText());
+    OUString aName(m_pNameED->GetText());
 
     switch(nTypeId)
     {
@@ -838,7 +838,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& )
 
             nTypeId = TYP_GETREFFLD;
             nSubType = REF_FOOTNOTE;
-            aName.Erase();
+            aName = "";
 
             if (pSh->GetSeqFtnList(aArr) && aArr.SeekEntry(aElem, &nPos))
             {
@@ -859,7 +859,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& )
 
             nTypeId = TYP_GETREFFLD;
             nSubType = REF_ENDNOTE;
-            aName.Erase();
+            aName = "";
 
             if (pSh->GetSeqFtnList(aArr, true) && aArr.SeekEntry(aElem, &nPos))
             {
@@ -943,8 +943,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& )
 
     if (IsFldEdit() && nTypeId == TYP_GETREFFLD)
     {
-        aVal.Insert('|', 0);
-        aVal.Insert(OUString::number(nSubType), 0);
+        aVal = OUString::number(nSubType) + "|" + aVal;
     }
 
     if (!IsFldEdit() || bModified ||
@@ -975,8 +974,8 @@ sal_uInt16 SwFldRefPage::GetGroup()
 
 void    SwFldRefPage::FillUserData()
 {
-    String sData(OUString(USER_DATA_VERSION));
-    sData += ';';
+    OUString sData(USER_DATA_VERSION);
+    sData += ";";
     sal_uInt16 nTypeSel = m_pTypeLB->GetSelectEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
         nTypeSel = USHRT_MAX;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 6f2bf7a2e8a7..06267bc62907 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -304,7 +304,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
             {
                 if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
                 {
-                    String sName(m_pSelectionLB->GetSelectEntry());
+                    OUString sName(m_pSelectionLB->GetSelectEntry());
                     m_pNameED->SetText(sName);
 
                     if (!IsFldDlgHtmlMode())
@@ -354,7 +354,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
                 if (nSelPos != LISTBOX_ENTRY_NOTFOUND)
                 {
-                    String sName(m_pSelectionLB->GetSelectEntry());
+                    OUString sName(m_pSelectionLB->GetSelectEntry());
                     if (!IsFldEdit())
                         m_pNameED->SetText(sName);
 
@@ -390,7 +390,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
             {
                 bValue = bNumFmt = sal_True;
 
-                String sName;
+                OUString sName;
 
                 sName = m_pSelectionLB->GetSelectEntry();
                 m_pNameED->SetText( sName );
@@ -440,9 +440,10 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
 
                         //JP 28.08.95: DDE-Topics/-Items can have blanks in their names!
                         //              That's not considered here yet
-                        String sCmd( pType->GetCmd() );
-                        sal_uInt16 nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeparator, ' ' );
-                        sCmd.SearchAndReplace( sfx2::cTokenSeparator, ' ', nTmpPos );
+                        OUString sCmd( pType->GetCmd() );
+                        sal_Int32 nTmpPos = 0;
+                        sCmd = sCmd.replaceFirst( OUString(sfx2::cTokenSeparator), " ", &nTmpPos );
+                        sCmd = sCmd.replaceFirst( OUString(sfx2::cTokenSeparator), " ", &nTmpPos );
 
                         m_pValueED->SetText( sCmd );
                         m_pFormatLB->SelectEntryPos(pType->GetType());
@@ -461,8 +462,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                     pFldTyp = GetCurField()->GetTyp();
                 else
                 {
-                    String sFldTypeName( m_pSelectionLB->GetEntry( nSelPos ));
-                    if( sFldTypeName.Len() )
+                    OUString sFldTypeName( m_pSelectionLB->GetEntry( nSelPos ));
+                    if( !sFldTypeName.isEmpty() )
                         pFldTyp = GetFldMgr().GetFldType( RES_SETEXPFLD,
                                                           sFldTypeName );
                     else
@@ -483,7 +484,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
                         m_pChapterLevelLB->SelectEntryPos( 0 );
                     else
                         m_pChapterLevelLB->SelectEntryPos( nLevel + 1 );
-                    String sDelim = ((SwSetExpFieldType*)pFldTyp)->GetDelimiter();
+                    OUString sDelim = ((SwSetExpFieldType*)pFldTyp)->GetDelimiter();
                     m_pSeparatorED->SetText( sDelim );
                     ChapterHdl();
                 }
@@ -565,7 +566,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
  --------------------------------------------------------------------*/
 void SwFldVarPage::UpdateSubType()
 {
-    String sOldSel;
+    OUString sOldSel;
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
     SetSelectionSel(m_pSelectionLB->GetSelectEntryPos());
@@ -667,7 +668,7 @@ void SwFldVarPage::UpdateSubType()
 
 sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
 {
-    String sOldSel, sOldNumSel;
+    OUString sOldSel, sOldNumSel;
     sal_uLong nOldNumFormat = 0;
 
     sal_uInt16 nFormatSel = m_pFormatLB->GetSelectEntryPos();
@@ -799,8 +800,8 @@ sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
  --------------------------------------------------------------------*/
 IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
 {
-    String sValue(m_pValueED->GetText());
-    sal_Bool bHasValue = sValue.Len() != 0;
+    OUString sValue(m_pValueED->GetText());
+    sal_Bool bHasValue = !sValue.isEmpty();
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
     bool bInsert = false, bApply = false, bDelete = false;
 
@@ -962,7 +963,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
     }
     else if (nCurId == m_nApplyId)
     {
-        String sName(m_pNameED->GetText()), sValue(m_pValueED->GetText());
+        OUString sName(m_pNameED->GetText()), sValue(m_pValueED->GetText());
         SwFieldType* pType = 0;
         sal_uInt16 nId = 0;
         sal_uInt16 nNumFormatPos = m_pNumFormatLB->GetSelectEntryPos();
@@ -1010,8 +1011,9 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
                     {
                         // DDE-Topics/-Items can have blanks in their names!
                         //  That's not being considered here yet.
-                        sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator );
-                        sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos );
+                        sal_Int32 nTmpPos = 0;
+                        sValue = sValue.replaceFirst( " ", OUString(sfx2::cTokenSeparator), &nTmpPos );
+                        sValue = sValue.replaceFirst( " ", OUString(sfx2::cTokenSeparator), &nTmpPos );
                         ((SwDDEFieldType*)pType)->SetCmd(sValue);
                         ((SwDDEFieldType*)pType)->SetType((sal_uInt16)nFormat);
                     }
@@ -1048,8 +1050,9 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox )
                 {
                     // DDE-Topics/-Items can have blanks in their names!
                     //  That's not being considered here yet.
-                    sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator );
-                    sValue.SearchAndReplace( ' ', sfx2::cTokenSeparator, nTmpPos );
+                    sal_Int32 nTmpPos = 0;
+                    sValue = sValue.replaceFirst( " ", OUString(sfx2::cTokenSeparator), &nTmpPos );
+                    sValue = sValue.replaceFirst( " ", OUString(sfx2::cTokenSeparator), &nTmpPos );
 
                     SwDDEFieldType aType(sName, sValue, (sal_uInt16)nFormat);
                     m_pSelectionLB->InsertEntry(sName);
@@ -1091,8 +1094,8 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& )
 {
     sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
 
-    String aVal(m_pValueED->GetText());
-    String aName(m_pNameED->GetText());
+    OUString aVal(m_pValueED->GetText());
+    OUString aName(m_pNameED->GetText());
 
     sal_uInt16 nSubType = m_pSelectionLB->GetSelectEntryPos();
     if(nSubType == LISTBOX_ENTRY_NOTFOUND)
@@ -1276,8 +1279,8 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt )
 
 void SwFldVarPage::FillUserData()
 {
-    String sData(OUString(USER_DATA_VERSION));
-    sData += ';';
+    OUString sData(USER_DATA_VERSION);
+    sData += ";";
     sal_uInt16 nTypeSel = m_pTypeLB->GetSelectEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
         nTypeSel = USHRT_MAX;
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index c6e63403f704..66c8982ced13 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -60,7 +60,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
     }
 
     // evaluation here
-    String aStr;
+    OUString aStr;
     if( RES_INPUTFLD == pField->GetTyp()->Which() )
     {   // it is an input field
         //
@@ -86,7 +86,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
     {
         // it is a SetExpression
         pSetFld = (SwSetExpField*)pField;
-        String sFormula(pSetFld->GetFormula());
+        OUString sFormula(pSetFld->GetFormula());
         //values are formatted - formulas are not
         CharClass aCC( LanguageTag( pSetFld->GetLanguage() ));
         if( aCC.isNumeric( sFormula ))
@@ -105,7 +105,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
     m_pOKBT->Enable( bEnable );
     m_pEditED->SetReadOnly( !bEnable );
 
-    if( aStr.Len() )
+    if( !aStr.isEmpty() )
         m_pEditED->SetText(convertLineEnd(aStr, GetSystemLineEnd()));
 }
 
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 4d27dd6636c1..04f639db7498 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -159,8 +159,8 @@ void SwJavaEditDialog::CheckTravel()
 
         if (pFld->IsCodeURL())
         {
-            String sURL(pFld->GetPar2());
-            if(sURL.Len())
+            OUString sURL(pFld->GetPar2());
+            if(!sURL.isEmpty())
             {
                 INetURLObject aINetURL(sURL);
                 if(INET_PROT_FILE == aINetURL.GetProtocol())
@@ -265,8 +265,8 @@ IMPL_LINK_NOARG(SwJavaEditDialog, DlgClosedHdl)
 {
     if ( pFileDlg->GetError() == ERRCODE_NONE )
     {
-        String sFileName = pFileDlg->GetPath();
-        if ( sFileName.Len() > 0 )
+        OUString sFileName = pFileDlg->GetPath();
+        if ( !sFileName.isEmpty() )
         {
             INetURLObject aINetURL( sFileName );
             if ( INET_PROT_FILE == aINetURL.GetProtocol() )