diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-07 17:16:26 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-08 08:08:35 +0200 |
commit | a209172669e7a2de6065486e385e4e3007b74bd2 (patch) | |
tree | 4a7e008cf700fb23ecc6e4cd44de1c6a08a9b7e7 /svtools | |
parent | 2675cbf042130f24fe7ea299b85b8f5f4794a667 (diff) |
loplugin:constantparam
Change-Id: Ib92aba17c46a4ada75c2a0630f281759d995f32e
Reviewed-on: https://gerrit.libreoffice.org/40843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/table/gridtablerenderer.hxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/imap.cxx | 16 | ||||
-rw-r--r-- | svtools/source/misc/imap2.cxx | 20 | ||||
-rw-r--r-- | svtools/source/table/gridtablerenderer.cxx | 1 | ||||
-rw-r--r-- | svtools/source/table/tablecontrol_impl.cxx | 2 |
5 files changed, 20 insertions, 21 deletions
diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx index 67360c78fc12..e091158a1981 100644 --- a/svtools/inc/table/gridtablerenderer.hxx +++ b/svtools/inc/table/gridtablerenderer.hxx @@ -69,7 +69,7 @@ namespace svt { namespace table OutputDevice& _rDevice, const tools::Rectangle& _rArea, bool _bIsColHeaderArea, bool _bIsRowHeaderArea, const StyleSettings& _rStyle ) override; - virtual void PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected, + virtual void PaintColumnHeader( ColPos _nCol, bool _bActive, OutputDevice& _rDevice, const tools::Rectangle& _rArea, const StyleSettings& _rStyle ) override; virtual void PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected, diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index 83d8cc5c205a..f22c87ca6240 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -66,7 +66,7 @@ IMapObject::IMapObject( const OUString& rURL, const OUString& rAltText, const OU } -void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const +void IMapObject::Write( SvStream& rOStm ) const { const rtl_TextEncoding eEncoding = osl_getThreadTextEncoding(); @@ -75,7 +75,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const rOStm.WriteUInt16( eEncoding ); const OString aRelURL = OUStringToOString( - URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), eEncoding); + URIHelper::simpleNormalizedMakeRelative("", aURL), eEncoding); write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, aRelURL); write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStm, aAltText, eEncoding); rOStm.WriteBool( bActive ); @@ -95,7 +95,7 @@ void IMapObject::Write( SvStream& rOStm, const OUString& rBaseURL ) const |* \******************************************************************************/ -void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL ) +void IMapObject::Read( SvStream& rIStm ) { rtl_TextEncoding nTextEncoding; @@ -109,7 +109,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL ) aTarget = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding); // make URL absolute - aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DecodeMechanism::Unambiguous ); + aURL = URIHelper::SmartRel2Abs( INetURLObject(""), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DecodeMechanism::Unambiguous ); std::unique_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ )); ReadIMapObject( rIStm ); @@ -840,7 +840,7 @@ void ImageMap::ImpWriteImageMap( SvStream& rOStm ) const for ( size_t i = 0; i < nCount; i++ ) { IMapObject* pObj = maList[ i ]; - pObj->Write( rOStm, "" ); + pObj->Write( rOStm ); } } @@ -876,7 +876,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount ) case IMAP_OBJ_RECTANGLE: { IMapRectangleObject* pObj = new IMapRectangleObject; - pObj->Read( rIStm, "" ); + pObj->Read( rIStm ); maList.push_back( pObj ); } break; @@ -884,7 +884,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount ) case IMAP_OBJ_CIRCLE: { IMapCircleObject* pObj = new IMapCircleObject; - pObj->Read( rIStm, "" ); + pObj->Read( rIStm ); maList.push_back( pObj ); } break; @@ -892,7 +892,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t nCount ) case IMAP_OBJ_POLYGON: { IMapPolygonObject* pObj = new IMapPolygonObject; - pObj->Read( rIStm, "" ); + pObj->Read( rIStm ); maList.push_back( pObj ); } break; diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index 665f54894e06..648d4758eb87 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -58,14 +58,14 @@ void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) rBuf.append(' '); } -void IMapObject::AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const +void IMapObject::AppendCERNURL(OStringBuffer& rBuf) const { - rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); + rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative("", aURL), osl_getThreadTextEncoding())); } -void IMapObject::AppendNCSAURL(OStringBuffer& rBuf, const OUString& rBaseURL) const +void IMapObject::AppendNCSAURL(OStringBuffer& rBuf) const { - rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative(rBaseURL, aURL), osl_getThreadTextEncoding())); + rBuf.append(OUStringToOString(URIHelper::simpleNormalizedMakeRelative("", aURL), osl_getThreadTextEncoding())); rBuf.append(' '); } @@ -75,7 +75,7 @@ void IMapRectangleObject::WriteCERN( SvStream& rOStm ) const AppendCERNCoords(aStrBuf, aRect.TopLeft()); AppendCERNCoords(aStrBuf, aRect.BottomRight()); - AppendCERNURL(aStrBuf, ""); + AppendCERNURL(aStrBuf); rOStm.WriteLine(aStrBuf.makeStringAndClear()); } @@ -84,7 +84,7 @@ void IMapRectangleObject::WriteNCSA( SvStream& rOStm ) const { OStringBuffer aStrBuf("rect "); - AppendNCSAURL(aStrBuf, ""); + AppendNCSAURL(aStrBuf); AppendNCSACoords(aStrBuf, aRect.TopLeft()); AppendNCSACoords(aStrBuf, aRect.BottomRight()); @@ -98,7 +98,7 @@ void IMapCircleObject::WriteCERN( SvStream& rOStm ) const AppendCERNCoords(aStrBuf, aCenter); aStrBuf.append(nRadius); aStrBuf.append(' '); - AppendCERNURL(aStrBuf, ""); + AppendCERNURL(aStrBuf); rOStm.WriteLine(aStrBuf.makeStringAndClear()); } @@ -107,7 +107,7 @@ void IMapCircleObject::WriteNCSA( SvStream& rOStm ) const { OStringBuffer aStrBuf("circle "); - AppendNCSAURL(aStrBuf, ""); + AppendNCSAURL(aStrBuf); AppendNCSACoords(aStrBuf, aCenter); AppendNCSACoords(aStrBuf, aCenter + Point(nRadius, 0)); @@ -122,7 +122,7 @@ void IMapPolygonObject::WriteCERN( SvStream& rOStm ) const for (sal_uInt16 i = 0; i < nCount; ++i) AppendCERNCoords(aStrBuf, aPoly[i]); - AppendCERNURL(aStrBuf, ""); + AppendCERNURL(aStrBuf); rOStm.WriteLine(aStrBuf.makeStringAndClear()); } @@ -132,7 +132,7 @@ void IMapPolygonObject::WriteNCSA( SvStream& rOStm ) const OStringBuffer aStrBuf("poly "); const sal_uInt16 nCount = std::min( aPoly.GetSize(), (sal_uInt16) 100 ); - AppendNCSAURL(aStrBuf, ""); + AppendNCSAURL(aStrBuf); for (sal_uInt16 i = 0; i < nCount; ++i) AppendNCSACoords(aStrBuf, aPoly[i]); diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index d9af224e8153..a33b9f9a63db 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -239,7 +239,6 @@ namespace svt { namespace table void GridTableRenderer::PaintColumnHeader( ColPos _nCol, bool, // _bActive: no special painting for the active column at the moment - bool, // _bSelected: selection for column header not yet implemented vcl::RenderContext& rRenderContext, const tools::Rectangle& _rArea, const StyleSettings& _rStyle) { diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index c43469c40f33..5bdb7678b6ea 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -1205,7 +1205,7 @@ namespace svt { namespace table continue; bool isActiveColumn = (aCell.getColumn() == getCurrentColumn()); - pRenderer->PaintColumnHeader(aCell.getColumn(), isActiveColumn, false/*isSelectedColumn*/, rRenderContext, aCell.getRect(), rStyle); + pRenderer->PaintColumnHeader(aCell.getColumn(), isActiveColumn, rRenderContext, aCell.getRect(), rStyle); } } // the area occupied by the row header, if any |