From d32be3ace8c8fd430bbecdf69f88a116b0ee91d1 Mon Sep 17 00:00:00 2001 From: Brij Mohan Lal Srivastava Date: Wed, 12 Nov 2014 14:24:10 +0530 Subject: fdo#86023 - O[U]String needs a 'clear' method Added clear() method to OString and OUString class, Updated appropriate call-sites. Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac Signed-off-by: Stephan Bergmann --- sw/source/ui/dbui/mmgreetingspage.cxx | 2 +- sw/source/ui/fldui/fldvar.cxx | 2 +- sw/source/ui/frmdlg/cption.cxx | 2 +- sw/source/ui/index/swuiidxmrk.cxx | 2 +- sw/source/ui/misc/outline.cxx | 4 ++-- sw/source/ui/vba/vbalisthelper.cxx | 32 ++++++++++++++++---------------- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'sw/source/ui') diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 8fa98e1a8938..7355613e3ad2 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -499,7 +499,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) if( nPos > 0 ) aAssignment[MM_PART_GENDER] = m_pFemaleColumnLB->GetSelectEntry(); else - aAssignment[MM_PART_GENDER] = OUString(); + aAssignment[MM_PART_GENDER].clear(); rConfigItem.SetColumnAssignment( rDBData, aAssignment ); } if(m_pFemaleFieldCB->IsValueChangedFromSaved()) diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 3581bc3d8b80..830bc1e14fcf 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -706,7 +706,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) if (!bSpecialFmt) { m_pNumFormatLB->SetDefFormat(GetCurField()->GetFormat()); - sOldNumSel = OUString(); + sOldNumSel.clear(); } else if (nTypeId == TYP_GETFLD || nTypeId == TYP_FORMELFLD) { diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 3c57f1d0b839..93424cf6fcc7 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -283,7 +283,7 @@ IMPL_LINK_INLINE_START( SwCaptionDialog, OptionHdl, Button*, pButton ) { OUString sFldTypeName = m_pCategoryBox->GetText(); if(sFldTypeName == m_sNone) - sFldTypeName = OUString(); + sFldTypeName.clear(); SwSequenceOptionDialog aDlg( pButton, rView, sFldTypeName ); aDlg.SetApplyBorderAndShadow(bCopyAttributes); aDlg.SetCharacterStyle( sCharacterStyle ); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 085ca163820f..1daede431e21 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1177,7 +1177,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox*, pBox) if (pBox->GetSelectEntry().isEmpty()) { for(int i = 0; i < AUTH_FIELD_END; i++) - m_sFields[i] = OUString(); + m_sFields[i].clear(); } m_pAuthorFI->SetText(m_sFields[AUTH_FIELD_AUTHOR]); m_pTitleFI->SetText(m_sFields[AUTH_FIELD_TITLE]); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index d669783bb769..2cab3c57fe44 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -601,14 +601,14 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox *, pBox ) pCollNames[i] = aSaveCollNames[i]; if(aCollName == aNoFmtName) - pCollNames[nTmpLevel] = OUString(); + pCollNames[nTmpLevel].clear(); else { pCollNames[nTmpLevel] = aCollName; // template already in use? for( i = 0; i < MAXLEVEL; ++i) if(i != nTmpLevel && pCollNames[i] == aCollName ) - pCollNames[i] = OUString(); + pCollNames[i].clear(); } // search the oldname and put it into the current entries diff --git a/sw/source/ui/vba/vbalisthelper.cxx b/sw/source/ui/vba/vbalisthelper.cxx index 5b5fca7be5f3..542302e0ccc0 100644 --- a/sw/source/ui/vba/vbalisthelper.cxx +++ b/sw/source/ui/vba/vbalisthelper.cxx @@ -318,14 +318,14 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce case 1: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 2: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } @@ -353,21 +353,21 @@ void SwVbaListHelper::CreateOutlineNumberForType1() throw( css::uno::RuntimeExce case 6: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } @@ -464,14 +464,14 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce case 0: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 1: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); sal_Int16 nParentNumbering = 0; setOrAppendPropertyValue( aPropertyValues, OUString(UNO_NAME_PARENT_NUMBERING ), uno::makeAny( nParentNumbering ) ); @@ -494,35 +494,35 @@ void SwVbaListHelper::CreateOutlineNumberForType4() throw( css::uno::RuntimeExce case 4: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 5: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 6: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 7: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 8: { nNumberingType = style::NumberingType::ROMAN_LOWER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } @@ -568,28 +568,28 @@ void SwVbaListHelper::CreateOutlineNumberForType6() throw( css::uno::RuntimeExce case 0: { nNumberingType = style::NumberingType::ROMAN_UPPER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 1: { nNumberingType = style::NumberingType::CHARS_UPPER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( '.' ); break; } case 2: { nNumberingType = style::NumberingType::ARABIC; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } case 3: { nNumberingType = style::NumberingType::CHARS_LOWER_LETTER; - sPrefix = OUString(); + sPrefix.clear(); sSuffix = OUString( ')' ); break; } -- cgit