diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:45:07 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:45:07 +0200 |
commit | d35f403d80c03aa944f4888036dd200e3360f1ef (patch) | |
tree | b4be6ec1d944a5c8b78c358c2cd8a6936c194242 /cui | |
parent | cb85f1c6ab6751920db838597fd502648a75572c (diff) |
loplugin:defaultparams
Change-Id: Ifa4f3f5f7df9bacec781e33b3725e4dc5a5fe63a
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/cfg.cxx | 4 | ||||
-rw-r--r-- | cui/source/customize/cfgutil.cxx | 14 | ||||
-rw-r--r-- | cui/source/customize/macropg.cxx | 4 | ||||
-rw-r--r-- | cui/source/customize/selector.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/linkdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/connpoolconfig.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/dbregister.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optpath.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 2 |
14 files changed, 28 insertions, 28 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 40cf3c12332b..6964ad0f3edb 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -782,7 +782,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( vcl::Window* pParent, const // initialize Entriesbox m_pEntriesBox->SetStyle(m_pEntriesBox->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN); m_pEntriesBox->SetSelectionMode(SINGLE_SELECTION); - m_pEntriesBox->SetTabs(&AccCfgTabs[0], MAP_APPFONT); + m_pEntriesBox->SetTabs(&AccCfgTabs[0]); m_pEntriesBox->Resize(); // OS: Hack for right selection m_pEntriesBox->SetSpaceBetweenEntries(0); m_pEntriesBox->SetDragDropMode(DragDropMode::NONE); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index ea27a2a5e284..0d2f6d4e8a31 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1179,7 +1179,7 @@ bool MenuSaveInData::Apply() uno::Reference< lang::XSingleComponentFactory > xFactory ( m_xMenuSettings, uno::UNO_QUERY ); - Apply( pRootEntry, xIndexContainer, xFactory, NULL ); + Apply( pRootEntry, xIndexContainer, xFactory ); try { @@ -3507,7 +3507,7 @@ void ToolbarSaveInData::SetSystemStyle( if ( nStyle == 0 ) { - toolbox->SetButtonType( ButtonType::SYMBOLONLY ); + toolbox->SetButtonType(); } else if ( nStyle == 1 ) { diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 3eb37ba97f35..ff248dd03e71 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -472,7 +472,7 @@ void SfxConfigGroupListBox::InitModule() catch(const css::container::NoSuchElementException&) { continue; } - SvTreeListEntry* pEntry = InsertEntry(sGroupName, NULL); + SvTreeListEntry* pEntry = InsertEntry(sGroupName); SfxGroupInfo_Impl* pInfo = new SfxGroupInfo_Impl(SfxCfgKind::GROUP_FUNCTION, rGroupID); pEntry->SetUserData(pInfo); } @@ -588,7 +588,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent static_cast<void *>(rootNode.get())); OUString aTitle(pImp->m_sDlgMacros); - SvTreeListEntry *pNewEntry = InsertEntry( aTitle, NULL ); + SvTreeListEntry *pNewEntry = InsertEntry( aTitle ); pNewEntry->SetUserData( pInfo ); pNewEntry->EnableChildrenOnDemand(); aArr.push_back( pInfo ); @@ -660,7 +660,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent Image aImage = GetImage( theChild, xCtx, bIsRootNode ); SvTreeListEntry* pNewEntry = - InsertEntry( uiName, NULL); + InsertEntry( uiName ); SetExpandedEntryBmp( pNewEntry, aImage ); SetCollapsedEntryBmp( pNewEntry, aImage ); @@ -695,7 +695,7 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent if ( m_xContext.is() ) { OUString sStyle( pImp->m_aStrGroupStyles ); - SvTreeListEntry *pEntry = InsertEntry( sStyle, 0 ); + SvTreeListEntry *pEntry = InsertEntry( sStyle ); SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SfxCfgKind::GROUP_STYLES, 0, 0 ); // TODO last parameter should contain user data aArr.push_back( pInfo ); pEntry->SetUserData( pInfo ); @@ -859,7 +859,7 @@ void SfxConfigGroupListBox::GroupSelected() { const css::frame::DispatchInformation& rInfo = lCommands[i]; OUString sUIName = MapCommand2UIName(rInfo.Command); - SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName, NULL); + SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry(sUIName); SfxGroupInfo_Impl* pGrpInfo = new SfxGroupInfo_Impl(SfxCfgKind::FUNCTION_SLOT, 0); pGrpInfo->sCommand = rInfo.Command; pGrpInfo->sLabel = sUIName; @@ -903,7 +903,7 @@ void SfxConfigGroupListBox::GroupSelected() Image aImage = GetImage( children[n], Reference< XComponentContext >(), false ); SvTreeListEntry* pNewEntry = - pFunctionListBox->InsertEntry( children[n]->getName(), NULL ); + pFunctionListBox->InsertEntry( children[n]->getName() ); pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage ); pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage ); @@ -936,7 +936,7 @@ void SfxConfigGroupListBox::GroupSelected() ++pIt ) { SfxStyleInfo_Impl* pStyle = new SfxStyleInfo_Impl(*pIt); - SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry( pStyle->sLabel, NULL ); + SvTreeListEntry* pFuncEntry = pFunctionListBox->InsertEntry( pStyle->sLabel ); SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SfxCfgKind::GROUP_STYLES, 0, pStyle ); pFunctionListBox->aArr.push_back( pGrpInfo ); pGrpInfo->sCommand = pStyle->sCommand; diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 30dda46e85fa..61f687bcf2c8 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -108,7 +108,7 @@ IMPL_LINK_TYPED( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) long _nWidth = maHeaderBar->GetItemSize( i ); aSz.Width() = _nWidth + nTmpSz; nTmpSz += _nWidth; - maListBox->SetTab( i, PixelToLogic( aSz, MapMode( MAP_APPFONT ) ).Width(), MAP_APPFONT ); + maListBox->SetTab( i, PixelToLogic( aSz, MapMode( MAP_APPFONT ) ).Width() ); } } } @@ -730,7 +730,7 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA rListBox.SetSelectHdl( LINK( this, _SvxMacroTabPage, SelectEvent_Impl )); rListBox.SetSelectionMode( SINGLE_SELECTION ); - rListBox.SetTabs( &nTabs[0], MAP_APPFONT ); + rListBox.SetTabs( &nTabs[0] ); Size aSize( nTabs[ 2 ], 0 ); rHeaderBar.InsertItem( ITEMID_EVENT, mpImpl->sStrEvent, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() ); aSize.Width() = 1764; // don't know what, so 42^2 is best to use... diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index b46fd23810f5..45ea0b6f337a 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -497,7 +497,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame { } - SvTreeListEntry *pEntry = InsertEntry( group, NULL ); + SvTreeListEntry *pEntry = InsertEntry( group ); SvxGroupInfo_Impl *pInfo = new SvxGroupInfo_Impl( SVX_CFGGROUP_FUNCTION, gids[i] ); @@ -530,7 +530,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame OUString aTitle = CUI_RESSTR(RID_SVXSTR_PRODMACROS); - SvTreeListEntry *pNewEntry = InsertEntry( aTitle, NULL ); + SvTreeListEntry *pNewEntry = InsertEntry( aTitle ); pNewEntry->SetUserData( pInfo ); pNewEntry->EnableChildrenOnDemand(); aArr.push_back( pInfo ); @@ -721,7 +721,7 @@ void SvxConfigGroupListBox::GroupSelected() else { pFuncEntry = pFunctionListBox->InsertEntry( - aLabel, NULL ); + aLabel ); } SvxGroupInfo_Impl *_pGroupInfo = new SvxGroupInfo_Impl( @@ -780,7 +780,7 @@ void SvxConfigGroupListBox::GroupSelected() Image aImage = GetImage( children[n], Reference< XComponentContext >(), false ); SvTreeListEntry* pNewEntry = - pFunctionListBox->InsertEntry( children[n]->getName(), NULL ); + pFunctionListBox->InsertEntry( children[n]->getName() ); pFunctionListBox->SetExpandedEntryBmp( pNewEntry, aImage ); pFunctionListBox->SetCollapsedEntryBmp(pNewEntry, aImage ); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index e73e1177363f..000a96236de8 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -135,7 +135,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, aProps.getArray()[ 0 ] = "IsFolder"; aProps.getArray()[ 1 ] = "IsDocument"; css::uno::Reference< XResultSet > xResultSet( - aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) ); + aCnt.createCursor( aProps ) ); if( xResultSet.is() ) { diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index f19e52398383..52eb96d295c8 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -118,7 +118,7 @@ void GraphicPreviewWindow::ScaleImageToFit() { BitmapEx aBmpEx( mpOrigGraphic->GetBitmapEx() ); - if( aBmpEx.Scale( aGrfSize, BmpScaleFlag::Default ) ) + if( aBmpEx.Scale( aGrfSize ) ) maScaledOrig = aBmpEx; } } diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 8fd24a159653..0f25cc3fa6a2 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -112,7 +112,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( vcl::Window * pParent, LinkManager* pMgr, bool b get(m_pPbBreakLink, "BREAK_LINK"); m_pTbLinks->SetSelectionMode( MULTIPLE_SELECTION ); - m_pTbLinks->SetTabs( &nTabs[0], MAP_APPFONT ); + m_pTbLinks->SetTabs( &nTabs[0] ); FixedText *pFtFiles = get<FixedText>("FILES"); pFtFiles->set_width_request(LogicToPixel(Size(nTabs[2] - nTabs[1] - 2, 0), MAP_APPFONT).Width()); FixedText *pFtLinks = get<FixedText>("LINKS"); @@ -358,7 +358,7 @@ IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, ChangeSourceClickHdl, Button *, void ) OUString sFilter; SvTreeListEntry* pEntry = m_pTbLinks->FirstSelected(); SvBaseLink* pLink = static_cast<SvBaseLink*>(pEntry->GetUserData()); - sfx2::LinkManager::GetDisplayNames( pLink, &sType, &sFile, 0, 0 ); + sfx2::LinkManager::GetDisplayNames( pLink, &sType, &sFile ); INetURLObject aUrl(sFile); if(aUrl.GetProtocol() == INetProtocol::File) { diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index a1a76fd94cc0..c3a4cee060c0 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -141,7 +141,7 @@ namespace offapp { // the config node where all pooling relevant info are stored under OConfigurationTreeRoot aConnectionPoolRoot = OConfigurationTreeRoot::createWithComponentContext( - ::comphelper::getProcessComponentContext(), getConnectionPoolNodeName(), -1, OConfigurationTreeRoot::CM_UPDATABLE); + ::comphelper::getProcessComponentContext(), getConnectionPoolNodeName()); if (!aConnectionPoolRoot.isValid()) // already asserted by the OConfigurationTreeRoot diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 393601dcdb4a..fbec45943505 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -150,7 +150,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( vcl::Window* pParent, cons m_pPathBox->SetSelectionMode( SINGLE_SELECTION ); m_pPathBox->SetPosSizePixel( Point( 0, aHeadSize.Height() ), Size( aBoxSize.Width(), aBoxSize.Height() - aHeadSize.Height() ) ); - m_pPathBox->SvSimpleTable::SetTabs( aTabs, MAP_APPFONT ); + m_pPathBox->SvSimpleTable::SetTabs( aTabs ); m_pPathBox->SetHighlightRange(); m_pPathBox->SetHelpId( HID_DBPATH_CTL_PATH ); @@ -370,7 +370,7 @@ IMPL_LINK_TYPED( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar long _nWidth = pBar->GetItemSize(i); aSz.Width() = _nWidth + nTmpSz; nTmpSz += _nWidth; - m_pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); + m_pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width() ); } } } diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 9959cbadf45a..598e35f2209f 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -697,7 +697,7 @@ IMPL_LINK_TYPED( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) long _nWidth = pBar->GetItemSize(i); aSz.Width() = _nWidth + nTmpSz; nTmpSz += _nWidth; - pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width(), MAP_APPFONT ); + pPathBox->SetTab( i, PixelToLogic( aSz, MapMode(MAP_APPFONT) ).Width() ); } } } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 4f744421b9a4..72deb491d34c 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -893,7 +893,7 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( vcl::Window* pParent, pCharClass = new CharClass( aLanguageTag ); static long aTabs[] = { 2 /* Tab-Count */, 1, 61 }; - m_pReplaceTLB->SetTabs( &aTabs[0], MAP_APPFONT ); + m_pReplaceTLB->SetTabs( &aTabs[0] ); m_pReplaceTLB->SetStyle( m_pReplaceTLB->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN ); m_pReplaceTLB->SetSelectHdl( LINK(this, OfaAutocorrReplacePage, SelectHdl) ); @@ -2072,7 +2072,7 @@ IMPL_LINK_TYPED( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) // start character selection dialog ScopedVclPtrInstance< SvxCharacterMap > pMap( this, true ); pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, - LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne, 0 )); + LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne )); pMap->SetText(nMode < SGL_END ? m_sStartQuoteDlg : m_sEndQuoteDlg ); sal_UCS4 cDlg; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index e048957047a8..ce791822704c 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1103,7 +1103,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp if ( pSizeBox->IsPtRelative() ) aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)( nSize / 10 ), SFX_MAPUNIT_POINT, eUnit ); else - aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)nSize, SFX_MAPUNIT_RELATIVE ); + aHeight.SetHeight( rOldItem.GetHeight(), (sal_uInt16)nSize ); rSet.Put( aHeight ); } else diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 6c3a2480ad6f..339d6418c5ef 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -383,7 +383,7 @@ void _SfxMacroTabPage::InitAndSetHandler() mpImpl->pMacroLB->SetSelectHdl( LINK( this, _SfxMacroTabPage, SelectMacro_Impl )); rListBox.SetSelectionMode( SINGLE_SELECTION ); - rListBox.SetTabs( &nTabs[0], MAP_APPFONT ); + rListBox.SetTabs( &nTabs[0] ); Size aSize( nTabs[ 2 ], 0 ); rHeaderBar.InsertItem( ITEMID_EVENT, mpImpl->sStrEvent, LogicToPixel( aSize, MapMode( MAP_APPFONT ) ).Width() ); aSize.Width() = 1764; // don't know what, so 42^2 is best to use... |