summaryrefslogtreecommitdiff
path: root/sw/source/ui/fldui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx2
-rw-r--r--sw/source/ui/fldui/flddinf.cxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx4
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx6
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx2
-rw-r--r--sw/source/ui/fldui/fldref.cxx2
-rw-r--r--sw/source/ui/fldui/fldvar.cxx4
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx8
-rw-r--r--sw/source/ui/fldui/javaedit.cxx6
9 files changed, 18 insertions, 18 deletions
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 1acb9a3016c9..fa2dc9b82cf3 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -106,7 +106,7 @@ void sw::DropDownFieldDialog::Apply()
{
if(pDropField)
{
- String sSelect = aListItemsLB.GetSelectEntry();
+ rtl::OUString sSelect = aListItemsLB.GetSelectEntry();
if(pDropField->GetPar1() != sSelect)
{
rSh.StartAllAction();
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index d119fffb3591..e9be1807596d 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -139,7 +139,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& )
nSelEntryData = static_cast< sal_uInt16 >(sVal.ToInt32());
}
- std::vector<String> aLst;
+ std::vector<rtl::OUString> aLst;
GetFldMgr().GetSubTypes(nTypeId, aLst);
for(size_t i = 0; i < aLst.size(); ++i)
{
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 2bce604a1ae0..461ea9d9fc1d 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -215,7 +215,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
if (nTypeId != USHRT_MAX)
{
- std::vector<String> aLst;
+ std::vector<rtl::OUString> aLst;
GetFldMgr().GetSubTypes(nTypeId, aLst);
if (nTypeId != TYP_AUTHORFLD)
@@ -347,7 +347,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl)
if(SVX_NUM_CHAR_SPECIAL != nTmp)
{
- sal_Int32 nOff = GetCurField()->GetPar2().ToInt32();
+ sal_Int32 nOff = GetCurField()->GetPar2().toInt32();
if( TYP_NEXTPAGEFLD == nTypeId && 1 != nOff )
aValueED.SetText(
String::CreateFromInt32(nOff - 1) );
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 03572c2cad30..9914d1626428 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -338,8 +338,8 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
aNameED.SetDropEnable(sal_True);
if (IsFldEdit())
{
- aCond1ED.SetText(GetCurField()->GetPar2().GetToken(0, '|'));
- aCond2ED.SetText(GetCurField()->GetPar2().GetToken(1, '|'));
+ aCond1ED.SetText(GetCurField()->GetPar2().getToken(0, '|'));
+ aCond2ED.SetText(GetCurField()->GetPar2().getToken(1, '|'));
}
bName = bValue = sal_True;
@@ -500,7 +500,7 @@ void SwFldFuncPage::UpdateSubType()
aSelectionLB.SetUpdateMode(sal_False);
aSelectionLB.Clear();
- std::vector<String> aLst;
+ std::vector<rtl::OUString> aLst;
GetFldMgr().GetSubTypes(nTypeId, aLst);
size_t nCount = aLst.size();
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 2ebd2cecd0dc..2981723555d5 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -498,7 +498,7 @@ sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId)
Description: localise subtypes of a field
--------------------------------------------------------------------*/
-sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<String>& rToFill)
+sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, std::vector<rtl::OUString>& rToFill)
{
sal_Bool bRet = sal_False;
SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell();
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index e3332d088ae3..b4764f2c051f 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -629,7 +629,7 @@ void SwFldRefPage::UpdateSubType()
}
else
{
- std::vector<String> aLst;
+ std::vector<rtl::OUString> aLst;
GetFldMgr().GetSubTypes(nTypeId, aLst);
for(size_t i = 0; i < aLst.size(); ++i)
aSelectionLB.InsertEntry(aLst[i]);
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index c0170edddb1e..b73c8dbb9810 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -602,7 +602,7 @@ void SwFldVarPage::UpdateSubType()
aSelectionLB.SetUpdateMode(sal_False);
aSelectionLB.Clear();
- std::vector<String> aList;
+ std::vector<rtl::OUString> aList;
GetFldMgr().GetSubTypes(nTypeId, aList);
size_t nCount = aList.size();
size_t nPos;
@@ -632,7 +632,7 @@ void SwFldVarPage::UpdateSubType()
break;
case TYP_GETFLD:
- if (aList[i] == ((SwFormulaField*)GetCurField())->GetFormula())
+ if (aList[i].equals(((const SwFormulaField*)GetCurField())->GetFormula()))
bInsert = sal_True;
break;
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 94de28a1a639..8661c7ca0911 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -155,7 +155,7 @@ void SwFldInputDlg::StateChanged( StateChangedType nType )
void SwFldInputDlg::Apply()
{
- String aTmp(comphelper::string::remove(aEditED.GetText(), '\r'));
+ rtl::OUString aTmp(comphelper::string::remove(aEditED.GetText(), '\r'));
rSh.StartAllAction();
sal_Bool bModified = sal_False;
@@ -163,21 +163,21 @@ void SwFldInputDlg::Apply()
{
if(pUsrType)
{
- if( aTmp != pUsrType->GetContent() )
+ if( !aTmp.equals(pUsrType->GetContent()) )
{
pUsrType->SetContent(aTmp);
pUsrType->UpdateFlds();
bModified = sal_True;
}
}
- else if( aTmp != pInpFld->GetPar1() )
+ else if( !aTmp.equals(pInpFld->GetPar1()) )
{
pInpFld->SetPar1(aTmp);
rSh.SwEditShell::UpdateFlds(*pInpFld);
bModified = sal_True;
}
}
- else if( aTmp != pSetFld->GetPar2() )
+ else if( !aTmp.equals(pSetFld->GetPar2()) )
{
pSetFld->SetPar2(aTmp);
rSh.SwEditShell::UpdateFlds(*pSetFld);
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index b7af46e91c1d..60d957a50c1e 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -232,7 +232,7 @@ void SwJavaEditDialog::SetFld()
if( bIsUrl )
{
aText = aUrlED.GetText();
- if(aText.Len())
+ if (!aText.isEmpty())
{
SfxMedium* pMedium = pSh->GetView().GetDocShell()->GetMedium();
INetURLObject aAbs;
@@ -246,8 +246,8 @@ void SwJavaEditDialog::SetFld()
else
aText = aEditED.GetText();
- if( !aType.Len() )
- aType = String::CreateFromAscii("JavaScript");
+ if( aType.isEmpty() )
+ aType = "JavaScript";
}
sal_Bool SwJavaEditDialog::IsUpdate()
generated by cgit (git 2.34.1) at 2024-08-10 04:20:33 +0000