diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-07-01 15:45:52 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-07-01 15:45:52 +0200 |
commit | e50ef195bc95f3f410119f623928382cb88b45d2 (patch) | |
tree | 0897c005806c84d7e2add9f4a2d407ff4fe911a5 /sw | |
parent | 363e39d63621b6c7017854ca5bb2f7668bb35846 (diff) |
New loplugin:stringconcat
Change-Id: Id7c517fb37bc28797c45fc0dde83e866f2aa4aac
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/doc/poolfmt.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/doc/tblafmt.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/css1atr.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/WW8Sttbf.cxx | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index da5151e5a8f9..0984cd0cc78d 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -1414,8 +1414,8 @@ bool SwDoc::IsPoolFmtUsed( sal_uInt16 nId ) const } else { - SAL_WARN("sw.core", "Invalid Pool Id: " << nId << " should be within " << - "[" << int(RES_POOLCHR_BEGIN) << "," << int(RES_POOLCHR_END) << ") or " << + SAL_WARN("sw.core", "Invalid Pool Id: " << nId << " should be within " + "[" << int(RES_POOLCHR_BEGIN) << "," << int(RES_POOLCHR_END) << ") or " "[" << int(RES_POOLFRM_BEGIN) << "," << int(RES_POOLFRM_END) << ")"); bFnd = false; } diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 851496b5f36f..3bfa33ddfc3d 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1118,7 +1118,7 @@ bool SwTableAutoFmtTbl::Load() bool SwTableAutoFmtTbl::Save() const { SvtPathOptions aPathOpt; - const OUString sNm( aPathOpt.GetUserConfigPath() + "/" + AUTOTABLE_FORMAT_NAME ); + const OUString sNm( aPathOpt.GetUserConfigPath() + "/" AUTOTABLE_FORMAT_NAME ); SfxMedium aStream(sNm, STREAM_STD_WRITE ); return Save( *aStream.GetOutStream() ) && aStream.Commit(); } diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index ab62ba6b20a5..2874ffd26d41 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -3274,7 +3274,7 @@ static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt, sOut += " "; sOut += OStringToOUString(sCSS1_url, RTL_TEXTENCODING_ASCII_US) + - "(\'" + OOO_STRING_SVTOOLS_HTML_O_data + ":" + aGraphicInBase64 + "\')"; + "(\'" OOO_STRING_SVTOOLS_HTML_O_data ":" + aGraphicInBase64 + "\')"; if( pRepeat ) { diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 634c229843c2..0631e70846d6 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -370,7 +370,7 @@ void SwCSS1Parser::SetTableTxtColl( bool bHeader ) pStyleEntry->GetPropertyInfo(), this ); } - OUString sTmp = sTag + " " + OOO_STRING_SVTOOLS_HTML_parabreak; + OUString sTmp = sTag + " " OOO_STRING_SVTOOLS_HTML_parabreak; pStyleEntry = GetTag( sTmp ); if( pStyleEntry ) { @@ -960,7 +960,7 @@ bool SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector, } else { - OUString sTmp = aToken2 + " " + OOO_STRING_SVTOOLS_HTML_parabreak; + OUString sTmp = aToken2 + " " OOO_STRING_SVTOOLS_HTML_parabreak; if( CSS1_SCRIPT_ALL == nScript ) { diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx b/sw/source/filter/ww8/WW8Sttbf.cxx index b791df619734..0fa8903cb364 100644 --- a/sw/source/filter/ww8/WW8Sttbf.cxx +++ b/sw/source/filter/ww8/WW8Sttbf.cxx @@ -89,8 +89,8 @@ namespace ww8 #endif } - SAL_INFO( "sw.ww8.level2", "<WW8Struct-getUString" << " offset=\"" << nOffset - << "\" count=\"" << nCount << "\"" << ">" << aResult << "</WW8Struct-getUString>" ); + SAL_INFO( "sw.ww8.level2", "<WW8Struct-getUString offset=\"" << nOffset + << "\" count=\"" << nCount << "\">" << aResult << "</WW8Struct-getUString>" ); return aResult; |