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 /oox | |
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 'oox')
-rw-r--r-- | oox/source/drawingml/chart/plotareaconverter.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/hyperlinkcontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/drawingml/textfont.cxx | 2 | ||||
-rw-r--r-- | oox/source/dump/dumperbase.cxx | 4 | ||||
-rw-r--r-- | oox/source/dump/oledumper.cxx | 4 | ||||
-rw-r--r-- | oox/source/ole/axcontrol.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/commonbehaviorcontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/vml/vmlshapecontext.cxx | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index f79bab8eef55..f15086df7e51 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -400,7 +400,7 @@ void PlotAreaConverter::convertFromModel( View3DModel& rView3DModel ) } else { - maAutoTitle = OUString(); + maAutoTitle.clear(); } } diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index a3e7254df380..aae50e80c45c 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -99,7 +99,7 @@ HyperLinkContext::HyperLinkContext( ContextHandler2Helper& rParent, } else if ( aPPAction.match( sHlinksldjump ) ) { - sURL = OUString(); + sURL.clear(); sal_Int32 nIndex2 = 0; while ( nIndex2 < sHref.getLength() ) diff --git a/oox/source/drawingml/textfont.cxx b/oox/source/drawingml/textfont.cxx index 742f020c2ace..b689d830836e 100644 --- a/oox/source/drawingml/textfont.cxx +++ b/oox/source/drawingml/textfont.cxx @@ -64,7 +64,7 @@ void TextFont::setAttributes( const AttributeList& rAttribs ) void TextFont::setAttributes( const OUString& sFontName ) { maTypeface = sFontName; - maPanose = OUString(); + maPanose.clear(); mnPitch = 0; mnCharset = WINDOWS_CHARSET_DEFAULT; } diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index aa0000c3bd3a..2dac7bc006b4 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -155,7 +155,7 @@ void ItemFormat::set( DataType eDataType, FormatType eFmtType, const OUString& r meDataType = eDataType; meFmtType = eFmtType; maItemName = rItemName; - maListName = OUString(); + maListName.clear(); } OUStringVector::const_iterator ItemFormat::parse( const OUStringVector& rFormatVec ) @@ -843,7 +843,7 @@ ConfigItemBase::LineType ConfigItemBase::readConfigLine( // ignore comments (starting with hash or semicolon) sal_Unicode cChar = aLine[ 0 ]; if( (cChar == '#') || (cChar == ';') ) - aLine = OUString(); + aLine.clear(); } } diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index 7a50b82b7daa..a16ea7121d54 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -1933,7 +1933,7 @@ void VbaDirStreamObject::implDumpRecordBody() break; case 0x0019: dumpByteString( "name" ); - maCurrStream = OUString(); + maCurrStream.clear(); mnCurrOffset = 0; break; case 0x001A: @@ -1945,7 +1945,7 @@ void VbaDirStreamObject::implDumpRecordBody() case 0x002B: if( !maCurrStream.isEmpty() ) mrVbaData.maStrmOffsets[ maCurrStream ] = mnCurrOffset; - maCurrStream = OUString(); + maCurrStream.clear(); mnCurrOffset = 0; break; case 0x002F: diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 76cc98927d87..d3d029773c79 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -533,7 +533,7 @@ void ControlConverter::convertToAxState( PropertySet& rPropSet, // control is awt or not ) rPropSet.getProperty( nState, PROP_State ); - rValue = OUString(); // empty e.g. 'don't know' + rValue.clear(); // empty e.g. 'don't know' if ( nState == API_STATE_UNCHECKED ) rValue = OUString('0'); else if ( nState == API_STATE_CHECKED ) diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx index e715f8ba8697..f61da9e1d9c4 100644 --- a/oox/source/ppt/commonbehaviorcontext.cxx +++ b/oox/source/ppt/commonbehaviorcontext.cxx @@ -131,7 +131,7 @@ namespace oox { namespace ppt { if( mbInAttrList ) { mbIsInAttrName = true; - msCurrentAttribute = OUString(); + msCurrentAttribute.clear(); } else { diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index 0471573db09d..f3ed601f8eed 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -168,7 +168,7 @@ ContextHandlerRef ClientDataContext::onCreateContext( sal_Int32 /*nElement*/, co { if( isRootElement() ) { - maElementText = OUString(); + maElementText.clear(); return this; } return 0; |