diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-08 13:48:09 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-08 18:23:53 +0100 |
commit | c774ad610eb828742a3eea050e5a7571ba3b00be (patch) | |
tree | 5563215fe7b481f99efc96017d61ecd5c7a59072 /svtools | |
parent | 24d0704fa468b300558a3f904ae853fcb7fca312 (diff) |
loplugin:constantparam in svtools..unotools
Change-Id: I6e72fbe44dcb65ee5162448e9a72e6437d56b044
Reviewed-on: https://gerrit.libreoffice.org/50948
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/misc/imap2.cxx | 20 | ||||
-rw-r--r-- | svtools/source/misc/langtab.cxx | 4 | ||||
-rw-r--r-- | svtools/source/svrtf/rtfout.cxx | 55 |
3 files changed, 38 insertions, 41 deletions
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index c1fdd20e6d20..e1424f5d47b4 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -270,7 +270,7 @@ void ImageMap::ImpReadCERNLine( const OString& rLine ) { const Point aTopLeft( ImpReadCERNCoords( &pStr ) ); const Point aBottomRight( ImpReadCERNCoords( &pStr ) ); - const OUString aURL( ImpReadCERNURL( &pStr, "" ) ); + const OUString aURL( ImpReadCERNURL( &pStr ) ); const tools::Rectangle aRect( aTopLeft, aBottomRight ); maList.emplace_back( new IMapRectangleObject( aRect, aURL, OUString(), OUString(), OUString(), OUString() ) ); @@ -279,7 +279,7 @@ void ImageMap::ImpReadCERNLine( const OString& rLine ) { const Point aCenter( ImpReadCERNCoords( &pStr ) ); const long nRadius = ImpReadCERNRadius( &pStr ); - const OUString aURL( ImpReadCERNURL( &pStr, "" ) ); + const OUString aURL( ImpReadCERNURL( &pStr ) ); maList.emplace_back( new IMapCircleObject( aCenter, nRadius, aURL, OUString(), OUString(), OUString(), OUString() ) ); } @@ -292,7 +292,7 @@ void ImageMap::ImpReadCERNLine( const OString& rLine ) for ( sal_uInt16 i = 0; i < nCount; i++ ) aPoly[ i ] = ImpReadCERNCoords( &pStr ); - aURL = ImpReadCERNURL( &pStr, "" ); + aURL = ImpReadCERNURL( &pStr ); maList.emplace_back( new IMapPolygonObject( aPoly, aURL, OUString(), OUString(), OUString(), OUString() ) ); } @@ -358,7 +358,7 @@ long ImageMap::ImpReadCERNRadius( const char** ppStr ) return aStr.makeStringAndClear().toInt32(); } -OUString ImageMap::ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL ) +OUString ImageMap::ImpReadCERNURL( const char** ppStr ) { OUString aStr(OUString::createFromAscii(*ppStr)); @@ -367,7 +367,7 @@ OUString ImageMap::ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL aStr = comphelper::string::stripEnd(aStr, ' '); aStr = comphelper::string::stripEnd(aStr, '\t'); - return INetURLObject::GetAbsURL( rBaseURL, aStr ); + return INetURLObject::GetAbsURL( "", aStr ); } sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm ) @@ -406,7 +406,7 @@ void ImageMap::ImpReadNCSALine( const OString& rLine ) if ( aToken == "rect" ) { - const OUString aURL( ImpReadNCSAURL( &pStr, "" ) ); + const OUString aURL( ImpReadNCSAURL( &pStr ) ); const Point aTopLeft( ImpReadNCSACoords( &pStr ) ); const Point aBottomRight( ImpReadNCSACoords( &pStr ) ); const tools::Rectangle aRect( aTopLeft, aBottomRight ); @@ -415,7 +415,7 @@ void ImageMap::ImpReadNCSALine( const OString& rLine ) } else if ( aToken == "circle" ) { - const OUString aURL( ImpReadNCSAURL( &pStr, "" ) ); + const OUString aURL( ImpReadNCSAURL( &pStr ) ); const Point aCenter( ImpReadNCSACoords( &pStr ) ); const Point aDX( aCenter - ImpReadNCSACoords( &pStr ) ); long nRadius = static_cast<long>(sqrt( static_cast<double>(aDX.X()) * aDX.X() + @@ -427,7 +427,7 @@ void ImageMap::ImpReadNCSALine( const OString& rLine ) { const sal_uInt16 nCount = comphelper::string::getTokenCount(aStr, ',') - 1; - const OUString aURL( ImpReadNCSAURL( &pStr, "" ) ); + const OUString aURL( ImpReadNCSAURL( &pStr ) ); tools::Polygon aPoly( nCount ); for ( sal_uInt16 i = 0; i < nCount; i++ ) @@ -437,7 +437,7 @@ void ImageMap::ImpReadNCSALine( const OString& rLine ) } } -OUString ImageMap::ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL ) +OUString ImageMap::ImpReadNCSAURL( const char** ppStr ) { OUStringBuffer aStr; char cChar = *(*ppStr)++; @@ -454,7 +454,7 @@ OUString ImageMap::ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL } } - return INetURLObject::GetAbsURL( rBaseURL, aStr.makeStringAndClear() ); + return INetURLObject::GetAbsURL( "", aStr.makeStringAndClear() ); } Point ImageMap::ImpReadNCSACoords( const char** ppStr ) diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 1432c8162e3e..91647533d104 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -281,9 +281,9 @@ LanguageType SvtLanguageTable::GetLanguageTypeAtIndex( sal_uInt32 nIndex ) } -sal_uInt32 SvtLanguageTable::AddLanguageTag( const LanguageTag& rLanguageTag, const OUString& rString ) +sal_uInt32 SvtLanguageTable::AddLanguageTag( const LanguageTag& rLanguageTag ) { - return theLanguageTable::get().AddItem( (rString.isEmpty() ? lcl_getDescription(rLanguageTag.getBcp47()) : rString), + return theLanguageTable::get().AddItem( lcl_getDescription(rLanguageTag.getBcp47()), rLanguageTag.getLanguageType()); } diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index ad97ac630215..aff066e76c55 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -58,7 +58,7 @@ SvStream& Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen ) // U+1D44E being encoded as UTF-16 surrogate pair "\u-10187?\u-9138?", so // sal_Unicode actually works fine here. SvStream& Out_Char(SvStream& rStream, sal_Unicode c, - int *pUCMode, rtl_TextEncoding eDestEnc, bool bWriteHelpFile) + int *pUCMode, rtl_TextEncoding eDestEnc) { const sal_Char* pStr = nullptr; switch (c) @@ -84,37 +84,34 @@ SvStream& Out_Char(SvStream& rStream, sal_Unicode c, pStr = OOO_STRING_SVTOOLS_RTF_TAB; break; default: - if(!bWriteHelpFile) + switch(c) { - switch(c) - { - case 149: - pStr = OOO_STRING_SVTOOLS_RTF_BULLET; - break; - case 150: - pStr = OOO_STRING_SVTOOLS_RTF_ENDASH; - break; - case 151: - pStr = OOO_STRING_SVTOOLS_RTF_EMDASH; - break; - case 145: - pStr = OOO_STRING_SVTOOLS_RTF_LQUOTE; - break; - case 146: - pStr = OOO_STRING_SVTOOLS_RTF_RQUOTE; - break; - case 147: - pStr = OOO_STRING_SVTOOLS_RTF_LDBLQUOTE; - break; - case 148: - pStr = OOO_STRING_SVTOOLS_RTF_RDBLQUOTE; - break; - } - - if (pStr) + case 149: + pStr = OOO_STRING_SVTOOLS_RTF_BULLET; + break; + case 150: + pStr = OOO_STRING_SVTOOLS_RTF_ENDASH; + break; + case 151: + pStr = OOO_STRING_SVTOOLS_RTF_EMDASH; + break; + case 145: + pStr = OOO_STRING_SVTOOLS_RTF_LQUOTE; + break; + case 146: + pStr = OOO_STRING_SVTOOLS_RTF_RQUOTE; + break; + case 147: + pStr = OOO_STRING_SVTOOLS_RTF_LDBLQUOTE; + break; + case 148: + pStr = OOO_STRING_SVTOOLS_RTF_RDBLQUOTE; break; } + if (pStr) + break; + switch (c) { case '\\': @@ -186,7 +183,7 @@ SvStream& RTFOutFuncs::Out_String( SvStream& rStream, const OUString& rStr, { int nUCMode = 1; for (sal_Int32 n = 0; n < rStr.getLength(); ++n) - Out_Char(rStream, rStr[n], &nUCMode, eDestEnc, false/*bWriteHelpFile*/); + Out_Char(rStream, rStr[n], &nUCMode, eDestEnc); if (nUCMode != 1) rStream.WriteCharPtr( "\\uc1" ).WriteCharPtr( " " ); // #i47831# add an additional whitespace, so that "document whitespaces" are not ignored.; return rStream; |