From 8051bb7e18ccae0f639e65dfa86bcc18a5fb9108 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 16 Oct 2013 11:18:56 +0200 Subject: converting remaining usage of String in SW to OUString Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e --- sw/source/ui/fldui/changedb.cxx | 2 +- sw/source/ui/fldui/flddb.cxx | 8 ++++---- sw/source/ui/fldui/flddinf.cxx | 2 +- sw/source/ui/fldui/flddok.cxx | 6 +++--- sw/source/ui/fldui/fldfunc.cxx | 4 ++-- sw/source/ui/fldui/fldmgr.cxx | 4 ++-- sw/source/ui/fldui/fldref.cxx | 4 ++-- sw/source/ui/fldui/fldvar.cxx | 20 ++++++++++---------- sw/source/ui/fldui/javaedit.cxx | 4 ++-- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'sw/source/ui/fldui') diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index d53463bd8f76..4115bc6f12be 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -97,7 +97,7 @@ void SwChangeDBDlg::FillDBPopup() const SwDBData& rDBData = pSh->GetDBData(); OUString sDBName(rDBData.sDataSource); OUString sTableName(rDBData.sCommand); - m_pAvailDBTLB->Select(sDBName, sTableName, aEmptyStr); + m_pAvailDBTLB->Select(sDBName, sTableName, aEmptyOUStr); std::vector aAllDBNames; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index c359e716a126..863a71522326 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -141,7 +141,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) if(pSh) { SwDBData aTmp(pSh->GetDBData()); - m_pDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, aEmptyStr); + m_pDatabaseTLB->Select(aTmp.sDataSource, aTmp.sCommand, aEmptyOUStr); } } } @@ -368,11 +368,11 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) if (!IsFldEdit()) { - m_pValueED->SetText(aEmptyStr); + m_pValueED->SetText(aEmptyOUStr); if (bCond) m_pConditionED->SetText(OUString("TRUE")); else - m_pConditionED->SetText(aEmptyStr); + m_pConditionED->SetText(aEmptyOUStr); } CheckInsert(); @@ -499,7 +499,7 @@ void SwFldDBPage::ActivateMailMergeAddress() m_pTypeLB->SelectEntryPos(m_pTypeLB->GetEntryPos( (const void*) nData )); m_pTypeLB->GetSelectHdl().Call(m_pTypeLB); const SwDBData& rData = SW_MOD()->GetDBConfig()->GetAddressSource(); - m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, aEmptyStr); + m_pDatabaseTLB->Select(rData.sDataSource, rData.sCommand, aEmptyOUStr); } void SwFldDBPage::SetWrtShell(SwWrtShell& rSh) diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 2dfcb30c4ba9..cc7c14d67810 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -444,7 +444,7 @@ sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) nOldFormat != nFormat || m_pFixedCB->GetState() != m_pFixedCB->GetSavedValue() || (DI_CUSTOM == nSubType && !aName.equals( m_sOldCustomFieldName ))) { - InsertFld(nTypeId, nSubType, aName, aEmptyStr, nFormat, + InsertFld(nTypeId, nSubType, aName, aEmptyOUStr, nFormat, ' ', m_pFormatLB->IsAutomaticLanguage()); } diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index b40f0d7f8290..464542d17ed5 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SwFldDokPage, TypeHdl) m_pValueED->SetText( OUString::number(nOff + 1) ); else - m_pValueED->SetText(aEmptyStr); + m_pValueED->SetText(aEmptyOUStr); } else m_pValueED->SetText(((SwPageNumberField*)GetCurField())->GetUserString()); @@ -532,7 +532,7 @@ IMPL_LINK_NOARG(SwFldDokPage, FormatHdl) m_pValueFT->SetText( sNewTxt ); if (sOldTxt != m_pValueFT->GetText()) - m_pValueED->SetText( aEmptyStr ); + m_pValueED->SetText( aEmptyOUStr ); } return 0; @@ -624,7 +624,7 @@ sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& ) m_pLevelED->GetText() != m_pLevelED->GetSavedValue() || m_pDateOffsetED->GetText() != m_pDateOffsetED->GetSavedValue()) { - InsertFld( nTypeId, nSubType, aEmptyStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() ); + InsertFld( nTypeId, nSubType, aEmptyOUStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() ); } return sal_False; diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 99bc62da0813..8785f6ed03c1 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -265,8 +265,8 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) } else { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } if(bDropDown) ListEnableHdl(0); diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index e7b7c4423e44..f349fefaa68a 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -845,7 +845,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam ) case TYP_POSTITFLD: { SwPostItFieldType* pType = (SwPostItFieldType*)pCurShell->GetFldType(0, RES_POSTITFLD); - pFld = new SwPostItField(pType, rData.sPar1, rData.sPar2, aEmptyStr, aEmptyStr, DateTime( DateTime::SYSTEM )); + pFld = new SwPostItField(pType, rData.sPar1, rData.sPar2, aEmptyOUStr, aEmptyOUStr, DateTime( DateTime::SYSTEM )); break; } case TYP_SCRIPTFLD: @@ -1202,7 +1202,7 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData, SwPaM *pPam ) if(pTyp) { SwSetExpField* pExpFld = - new SwSetExpField(pTyp, aEmptyStr, nFormatId); + new SwSetExpField(pTyp, aEmptyOUStr, nFormatId); // Don't change type of SwSetExpFieldType: sal_uInt16 nOldSubType = pExpFld->GetSubType(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 5b5ea20e4e25..7777b975606f 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -359,8 +359,8 @@ IMPL_LINK_NOARG(SwFldRefPage, TypeHdl) if ( ( !IsFldEdit() || m_pSelectionLB->GetEntryCount() ) && nOld != LISTBOX_ENTRY_NOTFOUND ) { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } switch (nTypeId) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 06267bc62907..162b83a50afc 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -199,8 +199,8 @@ IMPL_LINK_NOARG(SwFldVarPage, TypeHdl) bInit = sal_True; if (nOld != LISTBOX_ENTRY_NOTFOUND) { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } m_pValueED->SetDropEnable(false); @@ -275,8 +275,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { if (pBox) // only when interacting via mouse { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } } bValue = bName = bNumFmt = bInvisible = sal_True; @@ -348,8 +348,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { if (!IsFldEdit()) { - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); } if (nSelPos != LISTBOX_ENTRY_NOTFOUND) @@ -497,7 +497,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) m_pValueFT->SetText( SW_RESSTR( STR_OFFSET )); if (IsFldEdit() || pBox) // only when interacting via mouse - m_pNameED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -509,8 +509,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) break; case TYP_GETREFPAGEFLD: - m_pNameED->SetText(aEmptyStr); - m_pValueED->SetText(aEmptyStr); + m_pNameED->SetText(aEmptyOUStr); + m_pValueED->SetText(aEmptyOUStr); break; } @@ -696,7 +696,7 @@ sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) if (!bSpecialFmt) { m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat()); - sOldNumSel = aEmptyStr; + sOldNumSel = aEmptyOUStr; } else if (nTypeId == TYP_GETFLD || nTypeId == TYP_FORMELFLD) diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 04f639db7498..5dcbd0dd14a2 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -167,13 +167,13 @@ void SwJavaEditDialog::CheckTravel() sURL = aINetURL.PathToFileName(); } m_pUrlED->SetText(sURL); - m_pEditED->SetText(aEmptyStr); + m_pEditED->SetText(aEmptyOUStr); m_pUrlRB->Check(); } else { m_pEditED->SetText(pFld->GetPar2()); - m_pUrlED->SetText(aEmptyStr); + m_pUrlED->SetText(aEmptyOUStr); m_pEditRB->Check(); } m_pTypeED->SetText(pFld->GetPar1()); -- cgit