diff options
author | Brij Mohan Lal Srivastava <contactbrijmohan@gmail.com> | 2014-11-12 14:24:10 +0530 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-14 09:20:38 +0100 |
commit | d32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch) | |
tree | b373c084cb124434e0498867b24bc7bb333155dd /svl | |
parent | f5e86ebc097f0f8bc5b282511149cb026710ecde (diff) |
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 <sbergman@redhat.com>
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/inc/passwordcontainer.hxx | 4 | ||||
-rw-r--r-- | svl/source/items/ctypeitm.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/flagitem.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/macitem.cxx | 2 | ||||
-rw-r--r-- | svl/source/items/poolio.cxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 2 | ||||
-rw-r--r-- | svl/source/passwordcontainer/syscreds.cxx | 2 | ||||
-rw-r--r-- | svl/source/svdde/ddesvr.cxx | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index b9f591b945b3..3f8b9fba11ec 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -118,7 +118,7 @@ public: m_aName = aRecord.m_aName; m_aMemPass.clear(); - m_aPersPass = OUString(); + m_aPersPass.clear(); InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass ); return *this; @@ -177,7 +177,7 @@ public: else if ( nStatus == PERSISTENT_RECORD ) { m_bHasPersPass = false; - m_aPersPass = OUString(); + m_aPersPass.clear(); } } diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index b734f071c827..c713ad00e4cb 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -115,7 +115,7 @@ void CntContentTypeItem::SetValue( const OUString& rNewVal ) { // De-initialize enum type and presentation. _eType = CONTENT_TYPE_NOT_INIT; - _aPresentation = OUString(); + _aPresentation.clear(); CntUnencodedStringItem::SetValue( rNewVal ); } diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index bd9c5b968973..3ea30e125aa3 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -59,7 +59,7 @@ bool SfxFlagItem::GetPresentation const IntlWrapper * ) const { - rText = OUString(); + rText.clear(); for ( sal_uInt8 nFlag = 0; nFlag < GetFlagCount(); ++nFlag ) rText += GetFlag(nFlag) ? OUString("true") : OUString("false"); return true; diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 8fa633bbe1f3..98e9a980da81 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -228,7 +228,7 @@ bool SvxMacroItem::GetPresentation rText += cpDelim; } */ - rText = OUString(); + rText.clear(); return false; } diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 6c09ef373d64..cf719786a286 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -687,7 +687,7 @@ SvStream &SfxItemPool::Load(SvStream &rStream) // If not own Pool, then no name if ( aExternName != pImp->aName ) - pImp->aName = OUString(); + (pImp->aName).clear(); pImp->bStreaming = false; return rStream; diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index ca1f554e9cab..21d004b52715 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -1349,7 +1349,7 @@ void SvNumberFormatter::GetOutputString(const double& fOutNumber, { if (bNoZero && fOutNumber == 0.0) { - sOutString = OUString(); + sOutString.clear(); return; } SvNumberformat* pFormat = GetFormatEntry( nFIndex ); diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index bbb59cdbcf3e..b402a35e2cdc 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -154,7 +154,7 @@ namespace } while( removeLastSegment( aUrl ) && !aUrl.isEmpty() ); } - aResult = OUString(); + aResult.clear(); return false; } diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 1409b9d74cd4..24492be85a3a 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -227,7 +227,7 @@ found: if ( pItem ) pTopic->aItem = pItem->GetName(); else - pTopic->aItem = OUString(); + (pTopic->aItem).clear(); bool bRes = false; pInst->hCurConvSvr = (sal_IntPtr)hConv; |