diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:47:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:47:00 +0200 |
commit | 0705f7da48bf36949dd323ba0103db86708e00e7 (patch) | |
tree | 7083e0abcc5b9a17700498b97520cd8c8faa72e8 /sw/source/ui | |
parent | 85ce992473a435497014f856f95f3914783f8d72 (diff) |
loplugin:defaultparams
Change-Id: I11ff551955c1ac291ab576f2f18c2dd410427eda
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/chrdlg/swuiccoll.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbinsdlg.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmoutputpage.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/misc/glosbib.cxx | 2 |
7 files changed, 14 insertions, 15 deletions
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 9d8447bda9bf..533f2fce92b3 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -92,7 +92,7 @@ SwCondCollPage::SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet) m_pTbLinks->SetStyle(m_pTbLinks->GetStyle()|WB_HSCROLL|WB_CLIPCHILDREN); m_pTbLinks->SetSelectionMode( SINGLE_SELECTION ); - m_pTbLinks->SetTabs( &nTabs[0], MAP_APPFONT ); + m_pTbLinks->SetTabs( &nTabs[0] ); m_pTbLinks->Resize(); // OS: Hack for the right selection m_pTbLinks->SetSpaceBetweenEntries( 0 ); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index 5c65f3ff498c..98da05807554 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -974,7 +974,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, rSh.StartAllAction(); bool bUndo = rSh.DoesUndo(); if( bUndo ) - rSh.StartUndo( UNDO_EMPTY ); + rSh.StartUndo(); bool bAsTable = m_pRbAsTable->IsChecked(); SvNumberFormatter& rNumFormatr = *rSh.GetNumberFormatter(); @@ -1413,7 +1413,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, { rSh.DoUndo(); rSh.AppendUndoForInsertFromDB( bAsTable ); - rSh.EndUndo( UNDO_EMPTY ); + rSh.EndUndo(); } rSh.ClearMark(); rSh.EndAllAction(); diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 6f949aee867a..dbd3d81f2f28 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -748,7 +748,7 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, SaveOutputHdl_Impl, Button*, pButton, voi //now extract a document from the target document // the shell will be closed at the end, but it is more safe to use SfxObjectShellLock here SfxObjectShellLock xTempDocShell( new SwDocShell( SfxObjectCreateMode::STANDARD ) ); - xTempDocShell->DoInitNew( 0 ); + xTempDocShell->DoInitNew(); SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 ); SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() ); pTargetView->GetWrtShell().StartAction(); @@ -1146,7 +1146,7 @@ IMPL_LINK_TYPED(SwMailMergeOutputPage, SendDocumentsHdl_Impl, Button*, pButton, //now extract a document from the target document // the shell will be closed at the end, but it is more safe to use SfxObjectShellLock here SfxObjectShellLock xTempDocShell( new SwDocShell( SfxObjectCreateMode::STANDARD ) ); - xTempDocShell->DoInitNew( 0 ); + xTempDocShell->DoInitNew(); SfxViewFrame* pTempFrame = SfxViewFrame::LoadHiddenDocument( *xTempDocShell, 0 ); SwView* pTempView = static_cast<SwView*>( pTempFrame->GetViewShell() ); pTargetView->GetWrtShell().StartAction(); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 7c5cc8584e60..19f4763050ab 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1022,7 +1022,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, UseFileHdl, Button *, pButton, void ) // call dialog paste file IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, FileSearchHdl, Button*, void) { - if(!CheckPasswd(0)) + if(!CheckPasswd()) return; m_pOldDefDlgParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); @@ -1231,7 +1231,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, DDEHdl, Button*, pButton, void ) IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) { bool bChange = pBox == m_pPasswdPB; - if(!CheckPasswd(0)) + if(!CheckPasswd()) { if(!bChange) m_pPasswdCB->Check(!m_pPasswdCB->IsChecked()); @@ -1284,7 +1284,7 @@ IMPL_LINK_TYPED( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) // editing, with empty string no Ok() IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void) { - if(!CheckPasswd(0)) + if(!CheckPasswd()) return; SvTreeListEntry* pEntry = m_pTree->FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); @@ -1302,7 +1302,7 @@ IMPL_LINK_NOARG_TYPED(SwEditRegionDlg, NameEditHdl, Edit&, void) IMPL_LINK_TYPED( SwEditRegionDlg, ConditionEditHdl, Edit&, rEdit, void ) { Selection aSelect = rEdit.GetSelection(); - if(!CheckPasswd(0)) + if(!CheckPasswd()) return; rEdit.SetSelection(aSelect); SvTreeListEntry* pEntry = m_pTree->FirstSelected(); @@ -2199,7 +2199,7 @@ void SwSectionIndentTabPage::SetWrtShell(SwWrtShell& rSh) //set sensible values at the preview m_pPreviewWin->SetAdjust(SVX_ADJUST_BLOCK); m_pPreviewWin->SetLastLine(SVX_ADJUST_BLOCK); - const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE, 0 ); + const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE ); Size aPageSize(rPageRect.Width(), rPageRect.Height()); m_pPreviewWin->SetSize(aPageSize); } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 95b8aee2f1c9..f3b0f1d5ab0b 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2235,14 +2235,14 @@ void SwFrmPage::Init(const SfxItemSet& rSet, bool bReset) m_pAutoHeightCB->Check( bCheck ); HandleAutoCB( bCheck, *m_pHeightFT, *m_pHeightAutoFT, *m_aWidthED.get() ); if( eSize == ATT_VAR_SIZE ) - m_aHeightED.SetValue( m_aHeightED.GetMin(), FUNIT_NONE ); + m_aHeightED.SetValue( m_aHeightED.GetMin() ); eSize = rSize.GetWidthSizeType(); bCheck = eSize != ATT_FIX_SIZE; m_pAutoWidthCB->Check( bCheck ); HandleAutoCB( bCheck, *m_pWidthFT, *m_pWidthAutoFT, *m_aWidthED.get() ); if( eSize == ATT_VAR_SIZE ) - m_aWidthED.SetValue( m_aWidthED.GetMin(), FUNIT_NONE ); + m_aWidthED.SetValue( m_aWidthED.GetMin() ); if ( !bFormat ) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index d4cad9b07265..529d04b8897e 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -3883,8 +3883,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(vcl::Window* pParent, VclBuilderContainer* pB nWidth /=7; --nWidth; for(sal_uInt16 i = 1; i < 8; i++) - InsertDataColumn( i, *aTitles[i - 1], nWidth, - HeaderBarItemBits::STDSTYLE ); + InsertDataColumn( i, *aTitles[i - 1], nWidth ); } SwEntryBrowseBox::~SwEntryBrowseBox() diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 59d9bf13e465..576e8821ecb8 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -67,7 +67,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(vcl::Window * pParent, 0, nAppFontUnits }; - m_pGroupTLB->SetTabs( &nTabs[0], MAP_APPFONT ); + m_pGroupTLB->SetTabs( &nTabs[0] ); m_pGroupTLB->SetSelectHdl(LINK(this, SwGlossaryGroupDlg, SelectHdl)); m_pGroupTLB->GetModel()->SetSortMode(SortAscending); m_pNewPB->SetClickHdl(LINK(this, SwGlossaryGroupDlg, NewHdl)); |