diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-27 12:52:01 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-28 07:17:51 +0200 |
commit | b32ead5dd27c6f2b760e4196ebe0378fb8ec1a69 (patch) | |
tree | e647c37f069db3be229a4b89bc44fd21e64128fa /vcl/source | |
parent | 3956e4cb58033cae360beddf97136596ff3bb740 (diff) |
loplugin:checkunusedparams more part1
seems I got one of the checks wrong, and was missing a bunch of stuff
Change-Id: I2c662fc4e735f8d6cbe56c6f82906a60a580331b
Reviewed-on: https://gerrit.libreoffice.org/40481
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/components/dtranscomp.cxx | 2 | ||||
-rw-r--r-- | vcl/source/components/factory.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/canvastools.cxx | 3 | ||||
-rw-r--r-- | vcl/source/window/builder.cxx | 33 |
4 files changed, 21 insertions, 19 deletions
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx index 0946b0e34fa5..4419e269c982 100644 --- a/vcl/source/components/dtranscomp.cxx +++ b/vcl/source/components/dtranscomp.cxx @@ -231,7 +231,7 @@ OUString SAL_CALL Clipboard_getImplementationName() ); } -Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory( const Reference< XMultiServiceFactory > & ) +Reference< XSingleServiceFactory > SAL_CALL Clipboard_createFactory() { return Reference< XSingleServiceFactory >( new ClipboardFactory() ); } diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx index 4d7fa497ef35..27f701f721f9 100644 --- a/vcl/source/components/factory.cxx +++ b/vcl/source/components/factory.cxx @@ -59,7 +59,7 @@ extern "C" { } else if( vcl::Clipboard_getImplementationName().equalsAscii( pImplementationName ) ) { - xFactory = vcl::Clipboard_createFactory( xMgr ); + xFactory = vcl::Clipboard_createFactory(); } else if( vcl::DragSource_getImplementationName().equalsAscii( pImplementationName ) ) { diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx index 8bcf4d69bc90..7b75c586a8ae 100644 --- a/vcl/source/helper/canvastools.cxx +++ b/vcl/source/helper/canvastools.cxx @@ -65,8 +65,7 @@ namespace vcl { namespace unotools { - uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx( const uno::Reference< rendering::XGraphicDevice >& /*xGraphicDevice*/, - const ::BitmapEx& inputBitmap ) + uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx(const ::BitmapEx& inputBitmap ) { SAL_INFO( "vcl.helper", "vcl::unotools::xBitmapFromBitmapEx()" ); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index bc4b3047cfa0..5a7faafb87a9 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1867,7 +1867,7 @@ void VclBuilder::handleTabChild(vcl::Window *pParent, xmlreader::XmlReader &read --nLevel; } else if (name.equals("property")) - collectProperty(reader, sID, aProperties); + collectProperty(reader, aProperties); } if (res == xmlreader::XmlReader::Result::End) @@ -2172,7 +2172,7 @@ void VclBuilder::collectAtkAttribute(xmlreader::XmlReader &reader, stringmap &rM rMap[sProperty] = OUString::fromUtf8(sValue); } -void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID, sal_Int32 /*nRowIndex*/) +void VclBuilder::handleRow(xmlreader::XmlReader &reader, const OString &rID) { int nLevel = 1; @@ -2268,7 +2268,10 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI if (res == xmlreader::XmlReader::Result::Begin) { if (name.equals("row")) - handleRow(reader, rID, nRowIndex++); + { + handleRow(reader, rID); + nRowIndex++; + } else ++nLevel; } @@ -2283,7 +2286,7 @@ void VclBuilder::handleListStore(xmlreader::XmlReader &reader, const OString &rI } } -void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rID, vcl::Window *pWindow) +void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, vcl::Window *pWindow) { assert(pWindow); @@ -2306,7 +2309,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI { ++nLevel; if (name.equals("property")) - collectProperty(reader, rID, aProperties); + collectProperty(reader, aProperties); } if (res == xmlreader::XmlReader::Result::End) @@ -2330,7 +2333,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI } } -std::vector<OUString> VclBuilder::handleItems(xmlreader::XmlReader &reader, const OString & /*rID*/) +std::vector<OUString> VclBuilder::handleItems(xmlreader::XmlReader &reader) { int nLevel = 1; @@ -2432,7 +2435,7 @@ void VclBuilder::handleMenu(xmlreader::XmlReader &reader, const OString &rID) { ++nLevel; if (name.equals("property")) - collectProperty(reader, rID, aProperties); + collectProperty(reader, aProperties); } } @@ -2539,7 +2542,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read { ++nLevel; if (name.equals("property")) - collectProperty(reader, sID, aProperties); + collectProperty(reader, aProperties); else if (name.equals("accelerator")) collectAccelerator(reader, aAccelerators); } @@ -2557,7 +2560,7 @@ void VclBuilder::handleMenuObject(PopupMenu *pParent, xmlreader::XmlReader &read insertMenuObject(pParent, pSubMenu, sClass, sID, aProperties, aAccelerators); } -void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rID) +void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader) { m_pParserState->m_aSizeGroups.push_back(SizeGroup()); SizeGroup &rSizeGroup = m_pParserState->m_aSizeGroups.back(); @@ -2596,7 +2599,7 @@ void VclBuilder::handleSizeGroup(xmlreader::XmlReader &reader, const OString &rI else { if (name.equals("property")) - collectProperty(reader, rID, rSizeGroup.m_aProperties); + collectProperty(reader, rSizeGroup.m_aProperties); } } @@ -2785,12 +2788,12 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm } else if (sClass == "GtkSizeGroup") { - handleSizeGroup(reader, sID); + handleSizeGroup(reader); return nullptr; } else if (sClass == "AtkObject") { - handleAtkObject(reader, sID, pParent); + handleAtkObject(reader, pParent); return nullptr; } @@ -2824,7 +2827,7 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm handleChild(pCurrentChild, reader); } else if (name.equals("items")) - aItems = handleItems(reader, sID); + aItems = handleItems(reader); else if (name.equals("style")) { int nPriority = 0; @@ -2848,7 +2851,7 @@ VclPtr<vcl::Window> VclBuilder::handleObject(vcl::Window *pParent, xmlreader::Xm { ++nLevel; if (name.equals("property")) - collectProperty(reader, sID, aProperties); + collectProperty(reader, aProperties); else if (name.equals("attribute")) collectPangoAttribute(reader, aPangoAttributes); else if (name.equals("relation")) @@ -3103,7 +3106,7 @@ OString VclBuilder::getStyleClass(xmlreader::XmlReader &reader) return aRet; } -void VclBuilder::collectProperty(xmlreader::XmlReader &reader, const OString & /*rID*/, stringmap &rMap) +void VclBuilder::collectProperty(xmlreader::XmlReader &reader, stringmap &rMap) { xmlreader::Span name; int nsId; |