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/flddb.cxx6
-rw-r--r--sw/source/ui/fldui/flddok.cxx12
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx18
-rw-r--r--sw/source/ui/fldui/fldref.cxx4
-rw-r--r--sw/source/ui/fldui/fldvar.cxx16
5 files changed, 28 insertions, 28 deletions
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 76771fa71130..4ef4b5e62f77 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -232,8 +232,8 @@ sal_Bool SwFldDBPage::FillItemSet(SfxItemSet& )
sal_Bool bDBListBoxChanged = sOldDBName != sTempDBName ||
sOldTableName != sTempTableName || sOldColumnName != sTempColumnName;
if (!IsFldEdit() ||
- aConditionED.GetSavedValue() != aConditionED.GetText() ||
- aValueED.GetSavedValue() != aValueED.GetText() ||
+ OUString(aConditionED.GetSavedValue()) != aConditionED.GetText() ||
+ OUString(aValueED.GetSavedValue()) != aValueED.GetText() ||
bDBListBoxChanged ||
nOldFormat != nFormat || nOldSubType != nSubType)
{
@@ -408,7 +408,7 @@ void SwFldDBPage::CheckInsert()
if (nTypeId == TYP_DBNUMSETFLD)
{
- sal_Bool bHasValue = aValueED.GetText().Len() != 0;
+ sal_Bool bHasValue = !aValueED.GetText().isEmpty();
bInsert &= bHasValue;
}
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index fdb619593c13..79011585cca6 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -522,8 +522,8 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl)
// Prev/Next - PageNumFields special treatment:
sal_uInt16 nTmp = (sal_uInt16)(sal_uLong)aFormatLB.GetEntryData(
aFormatLB.GetSelectEntryPos() );
- String sOldTxt( aValueFT.GetText() );
- String sNewTxt( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE
+ OUString sOldTxt( aValueFT.GetText() );
+ OUString sNewTxt( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE
: STR_OFFSET ));
if( sOldTxt != sNewTxt )
@@ -600,7 +600,7 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& )
if( SVX_NUM_CHAR_SPECIAL != nFormat &&
(TYP_PREVPAGEFLD == nTypeId || TYP_NEXTPAGEFLD == nTypeId))
{
- sal_Int32 nVal = aValueED.GetText().ToInt32();
+ sal_Int32 nVal = aValueED.GetText().toInt32();
aVal = String::CreateFromInt32(nVal);
}
break;
@@ -618,9 +618,9 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& )
nOldSel != aSelectionLB.GetSelectEntryPos() ||
nOldFormat != nFormat ||
aFixedCB.GetState() != aFixedCB.GetSavedValue() ||
- aValueED.GetText() != aValueED.GetSavedValue() ||
- aLevelED.GetText() != aLevelED.GetSavedValue() ||
- aDateOffsetED.GetText() != aDateOffsetED.GetSavedValue())
+ aValueED.GetText() != OUString(aValueED.GetSavedValue()) ||
+ aLevelED.GetText() != OUString(aLevelED.GetSavedValue()) ||
+ aDateOffsetED.GetText() != OUString(aDateOffsetED.GetSavedValue()))
{
InsertFld( nTypeId, nSubType, aEmptyStr, aVal, nFormat, ' ', aNumFormatLB.IsAutomaticLanguage() );
}
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index df419e9fe151..ba1871b7157a 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -276,9 +276,9 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
if(bDropDown)
ListEnableHdl(0);
- if( aNameFT.GetText() != sOldNameFT )
+ if( aNameFT.GetText() != OUString(sOldNameFT) )
aNameFT.SetText(sOldNameFT);
- if (aValueFT.GetText() != sOldValueFT)
+ if (aValueFT.GetText() != OUString(sOldValueFT))
aValueFT.SetText(sOldValueFT);
switch (nTypeId)
@@ -354,7 +354,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl)
aNameED.SetDropEnable(sal_True);
bName = sal_True;
- const sal_uInt16 nLen = aNameED.GetText().Len();
+ const sal_Int32 nLen = aNameED.GetText().getLength();
if( !nLen || nLen > MAX_COMBINED_CHARACTERS )
bInsert = sal_False;
aNameED.SetAccessibleName(aNameFT.GetText());
@@ -464,7 +464,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl)
IMPL_LINK_NOARG(SwFldFuncPage, ListEnableHdl)
{
//enable "Add" button when text is in the Edit that's not already member of the box
- aListAddPB.Enable(aListItemED.GetText().Len() &&
+ aListAddPB.Enable(!aListItemED.GetText().isEmpty() &&
LISTBOX_ENTRY_NOTFOUND == aListItemsLB.GetEntryPos(aListItemED.GetText()));
sal_Bool bEnableButtons = aListItemsLB.GetSelectEntryCount() > 0;
aListRemovePB.Enable(bEnableButtons);
@@ -593,11 +593,11 @@ sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& )
}
if (!IsFldEdit() ||
- aNameED.GetSavedValue() != aNameED.GetText() ||
- aValueED.GetSavedValue() != aValueED.GetText() ||
- aCond1ED.GetSavedValue() != aCond1ED.GetText() ||
- aCond2ED.GetSavedValue() != aCond2ED.GetText() ||
- aListNameED.GetSavedValue() != aListNameED.GetText() ||
+ OUString(aNameED.GetSavedValue()) != aNameED.GetText() ||
+ OUString(aValueED.GetSavedValue()) != aValueED.GetText() ||
+ OUString(aCond1ED.GetSavedValue()) != aCond1ED.GetText() ||
+ OUString(aCond2ED.GetSavedValue()) != aCond2ED.GetText() ||
+ OUString(aListNameED.GetSavedValue()) != aListNameED.GetText() ||
bDropDownLBChanged ||
nOldFormat != nFormat)
{
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 520ae57cbce9..695a8f632df7 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -940,8 +940,8 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& )
}
if (!IsFldEdit() || bModified ||
- aNameED.GetSavedValue() != aNameED.GetText() ||
- aValueED.GetSavedValue() != aValueED.GetText() ||
+ OUString(aNameED.GetSavedValue()) != aNameED.GetText() ||
+ OUString(aValueED.GetSavedValue()) != aValueED.GetText() ||
aTypeLB.GetSavedValue() != aTypeLB.GetSelectEntryPos() ||
aSelectionLB.GetSavedValue() != aSelectionLB.GetSelectEntryPos() ||
aFormatLB.GetSavedValue() != aFormatLB.GetSelectEntryPos())
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index c9f90ab9bf71..2ae36613956e 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -226,9 +226,9 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
aValueED.SetText(GetFldMgr().GetCurFldPar2());
}
- if (aNameFT.GetText() != sOldNameFT)
+ if (aNameFT.GetText() != OUString(sOldNameFT))
aNameFT.SetText(sOldNameFT);
- if (aValueFT.GetText() != sOldValueFT)
+ if (aValueFT.GetText() != OUString(sOldValueFT))
aValueFT.SetText(sOldValueFT);
aNumFormatLB.SetUpdateMode(sal_False);
@@ -1097,7 +1097,7 @@ IMPL_LINK_NOARG(SwFldVarPage, ChapterHdl)
IMPL_LINK_NOARG(SwFldVarPage, SeparatorHdl)
{
- sal_Bool bEnable = aSeparatorED.GetText().Len() != 0 ||
+ sal_Bool bEnable = !aSeparatorED.GetText().isEmpty() ||
aChapterLevelLB.GetSelectEntryPos() == 0;
EnableInsert(bEnable);
@@ -1203,8 +1203,8 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& )
else
{
nSubType--;
- String sSeparator = rtl::OUString(aSeparatorED.GetText().GetChar(0));
- cSeparator = sSeparator.Len() ? sSeparator.GetChar(0) : ' ';
+ OUString sSeparator = rtl::OUString(aSeparatorED.GetText()[0]);
+ cSeparator = !sSeparator.isEmpty() ? sSeparator[0] : ' ';
}
break;
}
@@ -1215,14 +1215,14 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& )
}
if (!IsFldEdit() ||
- aNameED.GetSavedValue() != aNameED.GetText() ||
- aValueED.GetSavedValue() != aValueED.GetText() ||
+ OUString(aNameED.GetSavedValue()) != aNameED.GetText() ||
+ OUString(aValueED.GetSavedValue()) != aValueED.GetText() ||
aSelectionLB.GetSavedValue() != aSelectionLB.GetSelectEntryPos() ||
aFormatLB.GetSavedValue() != aFormatLB.GetSelectEntryPos() ||
nOldFormat != aNumFormatLB.GetFormat() ||
aInvisibleCB.GetState() != aInvisibleCB.GetSavedValue() ||
aChapterLevelLB.GetSavedValue() != aChapterLevelLB.GetSelectEntryPos() ||
- aSeparatorED.GetSavedValue() != aSeparatorED.GetText())
+ OUString(aSeparatorED.GetSavedValue()) != aSeparatorED.GetText())
{
InsertFld( nTypeId, nSubType, aName, aVal, nFormat,
cSeparator, aNumFormatLB.IsAutomaticLanguage() );
generated by cgit (git 2.34.1) at 2025-04-30 08:10:55 +0000