diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-04-25 00:20:47 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-04-27 14:00:49 +0200 |
| commit | a1ccf268b3960108c6c587bc1debe0f0281e1656 (patch) | |
| tree | 784ee71a16f8c0bcd9c102b0752bcd36e25b6f5a /sw | |
| parent | 76ff6453eee84d22f8037ec423b95d40edd10ca0 (diff) | |
OUString: constify, avoid temporaries and concatenated appends
Change-Id: I57f6aa0e711c87a6f1255f66822590fac1227e40
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 3bc98483ee1d..80f3d783367b 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -143,7 +143,7 @@ sal_Int32 ReadThroughComponent( uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(rxContext); SAL_INFO( "sw.filter", "parser created" ); // get filter - OUString aFilterName(OUString::createFromAscii(pFilterName)); + const OUString aFilterName(OUString::createFromAscii(pFilterName)); uno::Reference< xml::sax::XDocumentHandler > xFilter( rxContext->getServiceManager()->createInstanceWithArgumentsAndContext(aFilterName, rFilterArguments, rxContext), UNO_QUERY); @@ -193,9 +193,9 @@ sal_Int32 ReadThroughComponent( OSL_FAIL(aError.getStr()); #endif - OUString sErr( OUString::number( r.LineNumber )); - sErr += ","; - sErr += OUString::number( r.ColumnNumber ); + const OUString sErr( OUString::number( r.LineNumber ) + + "," + + OUString::number( r.ColumnNumber ) ); if( !rStreamName.isEmpty() ) { @@ -658,10 +658,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c xInfoSet->setPropertyValue("ProgressRange", aProgRange); Reference< container::XNameAccess > xLateInitSettings( document::NamedPropertyValues::create(xContext), UNO_QUERY_THROW ); - beans::NamedValue aLateInitSettings( - OUString( "LateInitSettings" ), - makeAny( xLateInitSettings ) - ); + beans::NamedValue aLateInitSettings( "LateInitSettings", makeAny( xLateInitSettings ) ); xInfoSet->setPropertyValue( "SourceStorage", Any( xStorage ) ); @@ -880,10 +877,9 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c if( !(IsOrganizerMode() || IsBlockMode() || bInsertMode || aOpt.IsFmtsOnly() ) ) { - OUString sStreamName("layout-cache"); try { - uno::Reference < io::XStream > xStm = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ ); + uno::Reference < io::XStream > xStm = xStorage->openStreamElement( "layout-cache", embed::ElementModes::READ ); SvStream* pStrm2 = utl::UcbStreamHelper::CreateStream( xStm ); if( !pStrm2->GetError() ) rDoc.ReadLayoutCache( *pStrm2 ); @@ -1006,7 +1002,7 @@ size_t XMLReader::GetSectionList( SfxMedium& rMedium, try { xml::sax::InputSource aParserInput; - OUString sDocName( "content.xml" ); + const OUString sDocName( "content.xml" ); aParserInput.sSystemId = sDocName; uno::Reference < io::XStream > xStm = xStg2->openStreamElement( sDocName, embed::ElementModes::READ ); |