From 2dab78ee2199d70b951aee86b80aab4374cc7c4f Mon Sep 17 00:00:00 2001 From: "Chr. Rossmanith" Date: Thu, 24 Jan 2013 15:12:43 +0100 Subject: Change GetSavedValue() to return OUString removed temporarily added OUString(...GetSavedValue()...) constructs again Change-Id: I11477654d217a5ae127c1ef1b19cbff56ed052a6 --- sw/source/ui/chrdlg/chardlg.cxx | 4 ++-- sw/source/ui/chrdlg/numpara.cxx | 4 ++-- sw/source/ui/config/mailconfigpage.cxx | 8 ++++---- sw/source/ui/config/optload.cxx | 4 ++-- sw/source/ui/config/optpage.cxx | 10 +++++----- sw/source/ui/dbui/mmgreetingspage.cxx | 4 ++-- sw/source/ui/fldui/flddb.cxx | 4 ++-- sw/source/ui/fldui/flddok.cxx | 6 +++--- sw/source/ui/fldui/fldfunc.cxx | 10 +++++----- sw/source/ui/fldui/fldref.cxx | 4 ++-- sw/source/ui/fldui/fldvar.cxx | 6 +++--- sw/source/ui/frmdlg/frmpage.cxx | 8 ++++---- sw/source/ui/index/cnttab.cxx | 2 +- sw/source/ui/misc/pggrid.cxx | 10 +++++----- sw/source/ui/table/tabledlg.cxx | 6 +++--- 15 files changed, 45 insertions(+), 45 deletions(-) (limited to 'sw') diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 7b450d9bc4ec..e7efa9177250 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -248,9 +248,9 @@ sal_Bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) SwFmtINetFmt aINetFmt(sURL, m_pTargetFrmLB->GetText()); aINetFmt.SetName(m_pNameED->GetText()); - bModified |= m_pURLED->GetText() != OUString(m_pURLED->GetSavedValue()); + bModified |= m_pURLED->GetText() != m_pURLED->GetSavedValue(); bModified |= m_pNameED->IsModified(); - bModified |= OUString(m_pTargetFrmLB->GetSavedValue()) != m_pTargetFrmLB->GetText(); + bModified |= m_pTargetFrmLB->GetSavedValue() != m_pTargetFrmLB->GetText(); // set valid settings first String sEntry = m_pVisitedLB->GetSelectEntry(); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 671b1956605b..54975d724f41 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -134,7 +134,7 @@ sal_Bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) } if(aNewStartCB.GetState() != aNewStartCB.GetSavedValue() || aNewStartNumberCB.GetState() != aNewStartNumberCB.GetSavedValue()|| - aNewStartNF.GetText() != OUString(aNewStartNF.GetSavedValue())) + aNewStartNF.GetText() != aNewStartNF.GetSavedValue()) { bModified = sal_True; sal_Bool bNewStartChecked = STATE_CHECK == aNewStartCB.GetState(); @@ -146,7 +146,7 @@ sal_Bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) if(aCountParaCB.GetSavedValue() != aCountParaCB.GetState() || aRestartParaCountCB.GetSavedValue() != aRestartParaCountCB.GetState() || - OUString(aRestartNF.GetSavedValue()) != aRestartNF.GetText() ) + aRestartNF.GetSavedValue() != aRestartNF.GetText() ) { SwFmtLineNumber aFmt; aFmt.SetStartValue( static_cast< sal_uLong >(aRestartParaCountCB.GetState() == STATE_CHECK ? diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 05c781af06ec..d044096a5c6c 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -170,15 +170,15 @@ SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrS sal_Bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) { - if(m_aDisplayNameED.GetText() != OUString(m_aDisplayNameED.GetSavedValue())) + if(m_aDisplayNameED.GetText() != m_aDisplayNameED.GetSavedValue()) m_pConfigItem->SetMailDisplayName(m_aDisplayNameED.GetText()); - if(m_aAddressED.GetText() != OUString(m_aAddressED.GetSavedValue())) + if(m_aAddressED.GetText() != m_aAddressED.GetSavedValue()) m_pConfigItem->SetMailAddress(m_aAddressED.GetText()); if( m_aReplyToCB.GetSavedValue() != m_aReplyToCB.IsChecked()) m_pConfigItem->SetMailReplyTo(m_aReplyToCB.IsChecked()); - if(m_aReplyToED.GetText() != OUString(m_aReplyToED.GetSavedValue())) + if(m_aReplyToED.GetText() != m_aReplyToED.GetSavedValue()) m_pConfigItem->SetMailReplyTo(m_aReplyToED.GetText()); - if(m_aServerED.GetText() != OUString(m_aServerED.GetSavedValue())) + if(m_aServerED.GetText() != m_aServerED.GetSavedValue()) m_pConfigItem->SetMailServer(m_aServerED.GetText()); if(m_aPortNF.IsModified()) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 24cbe9a8d27f..ca292f7c3fce 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -189,7 +189,7 @@ sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) bRet = sal_True; } - if(aTabMF.IsVisible() && aTabMF.GetText() != OUString(aTabMF.GetSavedValue())) + if(aTabMF.IsVisible() && aTabMF.GetText() != aTabMF.GetSavedValue()) { rSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, (sal_uInt16)aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)))); @@ -205,7 +205,7 @@ sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) bRet = sal_True; } - if (aWordCountED.GetText() != OUString(aWordCountED.GetSavedValue())) + if (aWordCountED.GetText() != aWordCountED.GetSavedValue()) { boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 8cd9f2406d63..d28bd4d0c132 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -631,11 +631,11 @@ sal_Bool SwStdFontTabPage::FillItemSet( SfxItemSet& ) String sLabel = aLabelBox .GetText(); String sIdx = aIdxBox .GetText(); - bool bStandardHeightChanged = OUString(aStandardHeightLB.GetSavedValue()) != aStandardHeightLB.GetText(); - bool bTitleHeightChanged = OUString(aTitleHeightLB.GetSavedValue()) != aTitleHeightLB.GetText(); - bool bListHeightChanged = OUString(aListHeightLB.GetSavedValue()) != aListHeightLB.GetText() && (!bListHeightDefault || !bSetListHeightDefault ); - bool bLabelHeightChanged = OUString(aLabelHeightLB.GetSavedValue()) != aLabelHeightLB.GetText() && (!bLabelHeightDefault || !bSetLabelHeightDefault ); - bool bIndexHeightChanged = OUString(aIndexHeightLB.GetSavedValue()) != aIndexHeightLB.GetText() && (!bIndexHeightDefault || !bSetIndexHeightDefault ); + bool bStandardHeightChanged = aStandardHeightLB.GetSavedValue() != aStandardHeightLB.GetText(); + bool bTitleHeightChanged = aTitleHeightLB.GetSavedValue() != aTitleHeightLB.GetText(); + bool bListHeightChanged = aListHeightLB.GetSavedValue() != aListHeightLB.GetText() && (!bListHeightDefault || !bSetListHeightDefault ); + bool bLabelHeightChanged = aLabelHeightLB.GetSavedValue() != aLabelHeightLB.GetText() && (!bLabelHeightDefault || !bSetLabelHeightDefault ); + bool bIndexHeightChanged = aIndexHeightLB.GetSavedValue() != aIndexHeightLB.GetText() && (!bIndexHeightDefault || !bSetIndexHeightDefault ); if(bNotDocOnly) { pFontConfig->SetFontStandard(sStandard, nFontGroup); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 5cbaa819da84..4e591ecf4c5a 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -367,7 +367,7 @@ sal_Bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPage aAssignment[MM_PART_GENDER] = m_aFemaleColumnLB.GetSelectEntry(); rConfig.SetColumnAssignment( rDBData, aAssignment ); } - if(m_aFemaleFieldCB.GetText() != OUString(m_aFemaleFieldCB.GetSavedValue())) + if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue()) rConfig.SetFemaleGenderValue(m_aFemaleFieldCB.GetText()); lcl_StoreGreetingsBox(m_aFemaleLB, rConfig, SwMailMergeConfigItem::FEMALE); @@ -561,7 +561,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) aAssignment[MM_PART_GENDER] = ::rtl::OUString(); rConfigItem.SetColumnAssignment( rDBData, aAssignment ); } - if(m_aFemaleFieldCB.GetText() != OUString(m_aFemaleFieldCB.GetSavedValue())) + if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue()) rConfigItem.SetFemaleGenderValue(m_aFemaleFieldCB.GetText()); EndDialog(RET_OK); 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() ); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 82ac9346884b..1a35cc492ca1 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -979,7 +979,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) aHoriOrient.SetRelationOrient( eRel ); aHoriOrient.SetPosToggle(aMirrorPagesCB.IsChecked()); - sal_Bool bMod = aAtHorzPosED.GetText() != OUString(aAtHorzPosED.GetSavedValue()); + sal_Bool bMod = aAtHorzPosED.GetText() != aAtHorzPosED.GetSavedValue(); bMod |= aMirrorPagesCB.GetState() != aMirrorPagesCB.GetSavedValue(); if ( eHOri == text::HoriOrientation::NONE && @@ -1017,7 +1017,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) aVertOrient.SetVertOrient ( eVOri); aVertOrient.SetRelationOrient( eRel ); - sal_Bool bMod = aAtVertPosED.GetText() != OUString(aAtVertPosED.GetSavedValue()); + sal_Bool bMod = aAtVertPosED.GetText() != aAtVertPosED.GetSavedValue(); if ( eVOri == text::VertOrientation::NONE && ( bNew || (bAtVertPosModified || bMod) || nOldV != eVOri) ) @@ -2982,9 +2982,9 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) sal_Bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) { sal_Bool bRet = sal_False; - if (aNameED.GetText() != OUString(aNameED.GetSavedValue())) + if (aNameED.GetText() != aNameED.GetSavedValue()) bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_NAME, aNameED.GetText())); - if (aAltNameED.GetText() != OUString(aAltNameED.GetSavedValue())) + if (aAltNameED.GetText() != aAltNameED.GetSavedValue()) bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_ALT_NAME, aAltNameED.GetText())); const SfxPoolItem* pOldItem; diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5c275f5cd034..71536a807c7c 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1059,7 +1059,7 @@ void SwTOXSelectTabPage::ApplyTOXDescription() const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType(); SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aCurType); aReadOnlyCB.Check(rDesc.IsReadonly()); - if(aTitleED.GetText() == OUString(aTitleED.GetSavedValue())) + if(aTitleED.GetText() == aTitleED.GetSavedValue()) { if(rDesc.GetTitle()) aTitleED.SetText(*rDesc.GetTitle()); diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 54a3c31fdc39..ca76be4638f3 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -184,14 +184,14 @@ sal_Bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) sal_Bool bRet = sal_False; if(aNoGridRB.GetSavedValue() != aNoGridRB.IsChecked()|| aLinesGridRB.GetSavedValue() != aLinesGridRB.IsChecked()|| - aLinesPerPageNF.GetSavedValue().ToInt32() + aLinesPerPageNF.GetSavedValue().toInt32() != aLinesPerPageNF.GetValue()|| - aTextSizeMF.GetSavedValue().ToInt32() != aTextSizeMF.GetValue()|| - aCharsPerLineNF.GetSavedValue().ToInt32() + aTextSizeMF.GetSavedValue().toInt32() != aTextSizeMF.GetValue()|| + aCharsPerLineNF.GetSavedValue().toInt32() != aCharsPerLineNF.GetValue()|| aSnapToCharsCB.GetSavedValue() != aSnapToCharsCB.IsChecked() || - aRubySizeMF.GetSavedValue().ToInt32() != aRubySizeMF.GetValue()|| - aCharWidthMF.GetSavedValue().ToInt32() != aCharWidthMF.GetValue()|| + aRubySizeMF.GetSavedValue().toInt32() != aRubySizeMF.GetValue()|| + aCharWidthMF.GetSavedValue().toInt32() != aCharWidthMF.GetValue()|| aRubyBelowCB.GetSavedValue() != aRubyBelowCB.IsChecked()|| aDisplayCB.GetSavedValue() != aDisplayCB.IsChecked()|| aPrintCB.GetSavedValue() != aPrintCB.IsChecked()|| diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 4c4da43aca89..0653144b8651 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -398,8 +398,8 @@ sal_Bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) if(bModified) { - if( m_pBottomMF->GetText() != OUString(m_pBottomMF->GetSavedValue()) || - m_pTopMF->GetText() != OUString(m_pTopMF->GetSavedValue()) ) + if( m_pBottomMF->GetText() != m_pBottomMF->GetSavedValue() || + m_pTopMF->GetText() != m_pTopMF->GetSavedValue() ) { SvxULSpaceItem aULSpace(RES_UL_SPACE); aULSpace.SetUpper( (sal_uInt16) m_pTopMF->Denormalize( @@ -410,7 +410,7 @@ sal_Bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) } } - if(m_pNameED->GetText() != OUString(m_pNameED->GetSavedValue())) + if(m_pNameED->GetText() != m_pNameED->GetSavedValue()) { rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, m_pNameED->GetText())); bModified = sal_True; -- cgit