diff options
author | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-01-24 15:12:43 +0100 |
---|---|---|
committer | Chr. Rossmanith <ChrRossmanith@gmx.de> | 2013-01-24 22:26:40 +0100 |
commit | 2dab78ee2199d70b951aee86b80aab4374cc7c4f (patch) | |
tree | 40e1d3652242d7edd900b5d3f73002e77954e92f /sw/source/ui/fldui | |
parent | 0057803c228e10bc1247ebb35c28cfc9ffc4cc5c (diff) |
Change GetSavedValue() to return OUString
removed temporarily added OUString(...GetSavedValue()...) constructs again
Change-Id: I11477654d217a5ae127c1ef1b19cbff56ed052a6
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r-- | sw/source/ui/fldui/flddb.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddok.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldfunc.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldref.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldvar.cxx | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 4ef4b5e62f77..2985131fc88f 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() || - OUString(aConditionED.GetSavedValue()) != aConditionED.GetText() || - OUString(aValueED.GetSavedValue()) != aValueED.GetText() || + aConditionED.GetSavedValue() != aConditionED.GetText() || + aValueED.GetSavedValue() != aValueED.GetText() || bDBListBoxChanged || nOldFormat != nFormat || nOldSubType != nSubType) { diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 79011585cca6..7577b34f72a7 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -618,9 +618,9 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& ) nOldSel != aSelectionLB.GetSelectEntryPos() || nOldFormat != nFormat || aFixedCB.GetState() != aFixedCB.GetSavedValue() || - aValueED.GetText() != OUString(aValueED.GetSavedValue()) || - aLevelED.GetText() != OUString(aLevelED.GetSavedValue()) || - aDateOffsetED.GetText() != OUString(aDateOffsetED.GetSavedValue())) + aValueED.GetText() != aValueED.GetSavedValue() || + aLevelED.GetText() != aLevelED.GetSavedValue() || + aDateOffsetED.GetText() != 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 ba1871b7157a..03aba2059aed 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -593,11 +593,11 @@ sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& ) } if (!IsFldEdit() || - 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() || + aNameED.GetSavedValue() != aNameED.GetText() || + aValueED.GetSavedValue() != aValueED.GetText() || + aCond1ED.GetSavedValue() != aCond1ED.GetText() || + aCond2ED.GetSavedValue() != aCond2ED.GetText() || + aListNameED.GetSavedValue() != aListNameED.GetText() || bDropDownLBChanged || nOldFormat != nFormat) { diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 695a8f632df7..520ae57cbce9 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 || - OUString(aNameED.GetSavedValue()) != aNameED.GetText() || - OUString(aValueED.GetSavedValue()) != aValueED.GetText() || + aNameED.GetSavedValue() != aNameED.GetText() || + 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 2ae36613956e..cb4fb7353380 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1215,14 +1215,14 @@ sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& ) } if (!IsFldEdit() || - OUString(aNameED.GetSavedValue()) != aNameED.GetText() || - OUString(aValueED.GetSavedValue()) != aValueED.GetText() || + aNameED.GetSavedValue() != aNameED.GetText() || + aValueED.GetSavedValue() != aValueED.GetText() || aSelectionLB.GetSavedValue() != aSelectionLB.GetSelectEntryPos() || aFormatLB.GetSavedValue() != aFormatLB.GetSelectEntryPos() || nOldFormat != aNumFormatLB.GetFormat() || aInvisibleCB.GetState() != aInvisibleCB.GetSavedValue() || aChapterLevelLB.GetSavedValue() != aChapterLevelLB.GetSelectEntryPos() || - OUString(aSeparatorED.GetSavedValue()) != aSeparatorED.GetText()) + aSeparatorED.GetSavedValue() != aSeparatorED.GetText()) { InsertFld( nTypeId, nSubType, aName, aVal, nFormat, cSeparator, aNumFormatLB.IsAutomaticLanguage() ); |