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 /sc/source/filter/excel | |
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 'sc/source/filter/excel')
-rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 10 | ||||
-rw-r--r-- | sc/source/filter/excel/xipivot.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xlchart.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xlpivot.cxx | 14 |
4 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 4f136eedc1bd..bf5ca8ac0552 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -550,7 +550,7 @@ void XclImpDrawObjBase::PostProcessSdrObject( XclImpDffConverter& rDffConv, SdrO void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen ) { - maObjName = OUString(); + maObjName.clear(); if( nNameLen > 0 ) { // name length field is repeated before the name @@ -562,7 +562,7 @@ void XclImpDrawObjBase::ReadName5( XclImpStream& rStrm, sal_uInt16 nNameLen ) void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = OUString(); + maMacroName.clear(); rStrm.Ignore( nMacroSize ); // skip padding byte for word boundaries, not contained in nMacroSize if( rStrm.GetRecPos() & 1 ) rStrm.Ignore( 1 ); @@ -570,19 +570,19 @@ void XclImpDrawObjBase::ReadMacro3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) void XclImpDrawObjBase::ReadMacro4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = OUString(); + maMacroName.clear(); rStrm.Ignore( nMacroSize ); } void XclImpDrawObjBase::ReadMacro5( XclImpStream& rStrm, sal_uInt16 nMacroSize ) { - maMacroName = OUString(); + maMacroName.clear(); rStrm.Ignore( nMacroSize ); } void XclImpDrawObjBase::ReadMacro8( XclImpStream& rStrm ) { - maMacroName = OUString(); + maMacroName.clear(); if( rStrm.GetRecLeft() > 6 ) { // macro is stored in a tNameXR token containing a link to a defined name diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index cce7b0226f98..2b48bcb116b0 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -650,7 +650,7 @@ void XclImpPivotCache::ReadDConName( XclImpStream& rStrm ) if (!mbSelfRef) // External name is not supported yet. - maSrcRangeName = OUString(); + maSrcRangeName.clear(); } void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm ) diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 52307ac5b2f5..63aeb55d7f34 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -607,7 +607,7 @@ OUString XclChObjectTable::InsertObject( const Any& rObj ) catch( Exception& ) { OSL_FAIL( "XclChObjectTable::InsertObject - cannot insert object" ); - aObjName = OUString(); + aObjName.clear(); } } return aObjName; diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 4acdf8ae1fa5..1112d62b7c36 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -49,7 +49,7 @@ XclPCItem::~XclPCItem() void XclPCItem::SetEmpty() { meType = EXC_PCITEM_EMPTY; - maText = OUString(); + maText.clear(); } void XclPCItem::SetText( const OUString& rText ) @@ -62,7 +62,7 @@ void XclPCItem::SetDouble( double fValue ) { meType = EXC_PCITEM_DOUBLE; //! TODO convert double to string - maText = OUString(); + maText.clear(); mfValue = fValue; } @@ -70,7 +70,7 @@ void XclPCItem::SetDateTime( const DateTime& rDateTime ) { meType = EXC_PCITEM_DATETIME; //! TODO convert date to string - maText = OUString(); + maText.clear(); maDateTime = rDateTime; } @@ -84,7 +84,7 @@ void XclPCItem::SetInteger( sal_Int16 nValue ) void XclPCItem::SetError( sal_uInt16 nError ) { meType = EXC_PCITEM_ERROR; - maText = OUString(); + maText.clear(); mnError = nError; switch( nError ) { @@ -103,7 +103,7 @@ void XclPCItem::SetBool( bool bValue ) { meType = EXC_PCITEM_BOOL; //! TODO convert boolean to string - maText = OUString(); + maText.clear(); mbValue = bValue; } @@ -184,7 +184,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPCFieldInfo& rInfo ) if( rStrm.GetRecLeft() >= 3 ) rInfo.maName = rStrm.ReadUniString(); else - rInfo.maName = OUString(); + rInfo.maName.clear(); return rStrm; } @@ -392,7 +392,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName ) rStrm >> nStrLen; rCachedName.mbUseCache = nStrLen == EXC_PT_NOSTRING; if( rCachedName.mbUseCache ) - rCachedName.maName = OUString(); + rCachedName.maName.clear(); else rCachedName.maName = rStrm.ReadUniString( nStrLen ); return rStrm; |