diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-05 18:03:25 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-07 05:57:17 +0000 |
commit | 70f87284c6ce77a49b1fac1431cea206f4b1dfa9 (patch) | |
tree | f979810ab0761169d094385940612aa1477056d6 /vcl | |
parent | 37a6bafea8416541d7d250d66a9e951400b197a3 (diff) |
improve defaultparams loplugin
to catch calling params with defaults like "= OUSString()"
Change-Id: Iad060e318ed492c22f8be44e326174fe6d28fff9
Reviewed-on: https://gerrit.libreoffice.org/22932
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/qa/cppunit/graphicfilter/filters-test.cxx | 27 | ||||
-rw-r--r-- | vcl/source/window/menu.cxx | 10 | ||||
-rw-r--r-- | vcl/source/window/toolbox2.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 4 |
4 files changed, 18 insertions, 27 deletions
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index ab0e1221ad67..76dfcf07121c 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -123,40 +123,31 @@ void VclFiltersTest::testCVEs() { #ifndef DISABLE_CVE_TESTS testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/wmf/"), - OUString()); + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/wmf/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/emf/"), - OUString()); + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/emf/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/sgv/"), - OUString()); + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/sgv/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/png/"), - OUString()); + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/png/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/jpg/"), - OUString()); + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/jpg/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/gif/"), - OUString()); + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/gif/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/bmp/"), - OUString()); + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/bmp/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/xbm/"), - OUString()); + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/xbm/")); testDir(OUString(), - getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/xpm/"), - OUString()); + getURLFromSrc("/vcl/qa/cppunit/graphicfilter/data/xpm/")); #endif } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 8d5bb2aa6760..489638bdf9b9 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -456,16 +456,16 @@ void Menu::InsertItem( const ResId& rResId ) Bitmap aBmp( ResId( static_cast<RSHEADER_TYPE*>(GetClassRes()), *pMgr ) ); Image const aImg(aBmp); if ( !aText.isEmpty() ) - InsertItem( nItemId, aText, aImg, nStatus, OString() ); + InsertItem( nItemId, aText, aImg, nStatus ); else - InsertItem( nItemId, aImg, nStatus, OString() ); + InsertItem( nItemId, aImg, nStatus ); } IncrementRes( GetObjSizeRes( static_cast<RSHEADER_TYPE*>(GetClassRes()) ) ); } else if ( !bSep ) - InsertItem(nItemId, aText, nStatus, OString()); + InsertItem(nItemId, aText, nStatus); if ( bSep ) - InsertSeparator(OString()); + InsertSeparator(); OUString aHelpText; if ( nObjMask & RSC_MENUITEM_HELPTEXT ) @@ -535,7 +535,7 @@ void Menu::InsertItem(const OUString& rCommand, const css::uno::Reference<css::f sal_uInt16 nItemId = GetItemCount() + 1; - InsertItem(nItemId, aLabel, aImage, MenuItemBits::NONE, OString()); + InsertItem(nItemId, aLabel, aImage); SetItemCommand(nItemId, rCommand); SetHelpText(nItemId, aTooltip); } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 7f904ffd0faa..f52211f0f613 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1836,7 +1836,7 @@ void ToolBox::UpdateCustomMenu() { sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START; MenuItemBits nMenuItemBits = ConvertBitsFromToolBoxToMenu(it->mnBits); - pMenu->InsertItem( id, it->maText, it->maImageOriginal, nMenuItemBits, OString()); + pMenu->InsertItem( id, it->maText, it->maImageOriginal, nMenuItemBits); pMenu->SetItemCommand( id, it->maCommandStr ); pMenu->EnableItem( id, it->mbEnabled ); pMenu->CheckItem ( id, it->meState == TRISTATE_TRUE ); @@ -1854,7 +1854,7 @@ void ToolBox::UpdateCustomMenu() { sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START; MenuItemBits nMenuItemBits = ConvertBitsFromToolBoxToMenu(it->mnBits); - pMenu->InsertItem( id, it->maText, it->maImageOriginal, nMenuItemBits, OString() ); + pMenu->InsertItem( id, it->maText, it->maImageOriginal, nMenuItemBits ); pMenu->SetItemCommand( id, it->maCommandStr ); pMenu->EnableItem( id, it->mbEnabled ); pMenu->CheckItem( id, it->meState == TRISTATE_TRUE ); diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 408d52cb5ad6..bb7db4a0622d 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -1482,7 +1482,7 @@ void PPDParser::getDefaultResolution( int& rXRes, int& rYRes ) const OUString PPDParser::translateKey( const OUString& i_rKey ) const { - OUString aResult( m_pTranslator->translateKey( i_rKey, css::lang::Locale() ) ); + OUString aResult( m_pTranslator->translateKey( i_rKey ) ); if( aResult.isEmpty() ) aResult = i_rKey; return aResult; @@ -1491,7 +1491,7 @@ OUString PPDParser::translateKey( const OUString& i_rKey ) const OUString PPDParser::translateOption( const OUString& i_rKey, const OUString& i_rOption ) const { - OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, css::lang::Locale() ) ); + OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption ) ); if( aResult.isEmpty() ) aResult = i_rOption; return aResult; |