sw/source/filter/ww8/docxexport.cxx | 2 sw/source/filter/ww8/docxsdrexport.cxx | 10 +-- sw/source/filter/ww8/wrtw8nds.cxx | 12 ++-- sw/source/filter/ww8/wrtw8sty.cxx | 2 sw/source/filter/ww8/ww8atr.cxx | 2 sw/source/filter/ww8/ww8par2.cxx | 4 - sw/source/filter/ww8/ww8par4.cxx | 2 sw/source/filter/xml/swxml.cxx | 2 sw/source/filter/xml/xmlexp.cxx | 3 - sw/source/filter/xml/xmlimp.cxx | 12 ++-- sw/source/filter/xml/xmltble.cxx | 3 - sw/source/ui/chrdlg/break.cxx | 2 sw/source/ui/chrdlg/chardlg.cxx | 3 - sw/source/ui/chrdlg/pardlg.cxx | 2 sw/source/ui/chrdlg/swuiccoll.cxx | 2 sw/source/ui/config/optcomp.cxx | 2 sw/source/ui/dbui/addresslistdialog.cxx | 2 sw/source/ui/dbui/dbinsdlg.cxx | 19 +++---- sw/source/ui/dbui/mmlayoutpage.cxx | 2 sw/source/ui/dialog/uiregionsw.cxx | 20 +++---- sw/source/ui/envelp/envprt.cxx | 4 - sw/source/ui/envelp/mailmrge.cxx | 4 - sw/source/ui/fmtui/tmpdlg.cxx | 2 sw/source/ui/frmdlg/column.cxx | 2 sw/source/ui/frmdlg/frmpage.cxx | 22 +++----- sw/source/ui/frmdlg/wrap.cxx | 2 sw/source/ui/index/cnttab.cxx | 15 ++--- sw/source/ui/index/swuiidxmrk.cxx | 8 +-- sw/source/ui/misc/glossary.cxx | 2 sw/source/ui/misc/insfnote.cxx | 4 - sw/source/ui/misc/linenum.cxx | 2 sw/source/ui/misc/num.cxx | 6 +- sw/source/ui/misc/outline.cxx | 2 sw/source/ui/misc/pgfnote.cxx | 4 - sw/source/ui/misc/srtdlg.cxx | 6 +- sw/source/ui/table/convert.cxx | 2 sw/source/ui/table/tabledlg.cxx | 22 ++++---- sw/source/ui/vba/vbatablehelper.cxx | 2 sw/source/uibase/app/appenv.cxx | 4 - sw/source/uibase/app/applab.cxx | 2 sw/source/uibase/app/docsh.cxx | 8 +-- sw/source/uibase/app/docsh2.cxx | 12 ++-- sw/source/uibase/app/docst.cxx | 2 sw/source/uibase/app/docstyle.cxx | 20 +++---- sw/source/uibase/app/swmodul1.cxx | 2 sw/source/uibase/config/uinums.cxx | 2 sw/source/uibase/dbui/dbmgr.cxx | 7 +- sw/source/uibase/dbui/dbui.cxx | 2 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 4 - sw/source/uibase/dochdl/gloshdl.cxx | 10 +-- sw/source/uibase/dochdl/swdtflvr.cxx | 4 - sw/source/uibase/docvw/AnnotationMenuButton.cxx | 8 +-- sw/source/uibase/docvw/AnnotationWin.cxx | 8 +-- sw/source/uibase/docvw/HeaderFooterWin.cxx | 6 +- sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 2 sw/source/uibase/docvw/SidebarWin.cxx | 4 - sw/source/uibase/docvw/edtwin.cxx | 30 +++++------ sw/source/uibase/docvw/romenu.cxx | 2 sw/source/uibase/docvw/srcedtw.cxx | 10 +-- sw/source/uibase/lingu/olmenu.cxx | 14 ++--- sw/source/uibase/misc/glosdoc.cxx | 2 sw/source/uibase/misc/redlndlg.cxx | 4 - sw/source/uibase/ribbar/conform.cxx | 2 sw/source/uibase/ribbar/drawbase.cxx | 2 sw/source/uibase/ribbar/inputwin.cxx | 6 +- sw/source/uibase/ribbar/workctrl.cxx | 2 sw/source/uibase/shells/beziersh.cxx | 2 sw/source/uibase/shells/drawdlg.cxx | 4 - sw/source/uibase/shells/drawsh.cxx | 4 - sw/source/uibase/shells/drformsh.cxx | 2 sw/source/uibase/shells/drwbassh.cxx | 4 - sw/source/uibase/shells/drwtxtex.cxx | 2 sw/source/uibase/shells/drwtxtsh.cxx | 2 sw/source/uibase/shells/frmsh.cxx | 2 sw/source/uibase/shells/grfsh.cxx | 3 - sw/source/uibase/shells/langhelper.cxx | 6 +- sw/source/uibase/shells/mediash.cxx | 2 sw/source/uibase/shells/navsh.cxx | 2 sw/source/uibase/shells/textdrw.cxx | 2 sw/source/uibase/shells/textfld.cxx | 2 sw/source/uibase/shells/textsh.cxx | 10 +-- sw/source/uibase/shells/textsh1.cxx | 18 +++--- sw/source/uibase/shells/txtattr.cxx | 4 - sw/source/uibase/shells/txtcrsr.cxx | 50 +++++++++---------- sw/source/uibase/sidebar/PagePropertyPanel.cxx | 2 sw/source/uibase/sidebar/ThemePanel.cxx | 4 - sw/source/uibase/table/tablemgr.cxx | 4 - sw/source/uibase/uiview/formatclipboard.cxx | 4 - sw/source/uibase/uiview/pview.cxx | 12 ++-- sw/source/uibase/uiview/scroll.cxx | 2 sw/source/uibase/uiview/view.cxx | 8 +-- sw/source/uibase/uiview/view1.cxx | 6 +- sw/source/uibase/uiview/view2.cxx | 7 +- sw/source/uibase/uiview/viewling.cxx | 8 +-- sw/source/uibase/uiview/viewmdi.cxx | 8 +-- sw/source/uibase/uiview/viewport.cxx | 4 - sw/source/uibase/uiview/viewstat.cxx | 2 sw/source/uibase/uno/unoatxt.cxx | 26 ++++----- sw/source/uibase/utlui/content.cxx | 12 +--- sw/source/uibase/utlui/navipi.cxx | 10 +-- sw/source/uibase/utlui/tmplctrl.cxx | 2 sw/source/uibase/utlui/uitool.cxx | 4 - sw/source/uibase/wrtsh/delete.cxx | 2 sw/source/uibase/wrtsh/move.cxx | 2 sw/source/uibase/wrtsh/select.cxx | 12 ++-- sw/source/uibase/wrtsh/wrtsh1.cxx | 2 ucb/source/core/identify.cxx | 2 ucb/source/ucp/cmis/cmis_content.cxx | 2 ucb/source/ucp/ext/ucpext_content.cxx | 2 ucb/source/ucp/ftp/ftpcontent.cxx | 2 ucb/source/ucp/webdav-neon/webdavcontent.cxx | 7 +- uui/source/authfallbackdlg.cxx | 2 uui/source/secmacrowarnings.cxx | 2 uui/source/unknownauthdlg.cxx | 2 vcl/unx/generic/app/i18n_status.cxx | 2 vcl/unx/generic/window/salframe.cxx | 4 - vcl/unx/gtk/a11y/atkfactory.cxx | 2 vcl/unx/gtk/a11y/atkwindow.cxx | 2 vcl/unx/gtk/window/gtksalframe.cxx | 14 ++--- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 120 files changed, 348 insertions(+), 363 deletions(-)
New commits: commit 3d614a639e8b46f9197cd0d74c306fcfa9bb7e45 Author: Noel Grandin <n...@peralex.com> Date: Fri Aug 21 09:15:32 2015 +0200 loplugin: defaultparams Change-Id: If1d183f32079548645b4974a16161dc997c026b7 diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx index e36442c..f03cbb2 100644 --- a/ucb/source/core/identify.cxx +++ b/ucb/source/core/identify.cxx @@ -61,7 +61,7 @@ OUString SAL_CALL ContentIdentifier::getContentProviderScheme() { // The content provider scheme is the part before the first ':' // within the content id. - sal_Int32 nPos = m_aContentId.indexOf( ':', 0 ); + sal_Int32 nPos = m_aContentId.indexOf( ':' ); if ( nPos != -1 ) { OUString aScheme( m_aContentId.copy( 0, nPos ) ); diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index d23ce6e..0527783 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -235,7 +235,7 @@ namespace for ( sal_Int32 i = 0; i < m_nNumValue; ++i ) { OUStringBuffer aBuffer; - ::sax::Converter::convertDateTime( aBuffer, seqValue[i], 0, false ); + ::sax::Converter::convertDateTime( aBuffer, seqValue[i], 0 ); values.push_back( OUSTR_TO_STDSTR( aBuffer.makeStringAndClear( ) ) ); } type = libcmis::PropertyType::DateTime; diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 3ee8ad6..0ba144f 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -343,7 +343,7 @@ namespace ucb { namespace ucp { namespace ext const OUString sURL = m_xIdentifier->getContentIdentifier(); // cut the root URL - if ( !sURL.match( sRootURL, 0 ) ) + if ( !sURL.match( sRootURL ) ) { SAL_INFO( "ucb.ucp.ext", "illegal URL structure - no root" ); break; diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 09a59ca..442fe1d 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -694,7 +694,7 @@ FTPContent::getParent( ) throw (RuntimeException, std::exception) { Reference<XContentIdentifier> - xIdent(new FTPContentIdentifier(m_aFTPURL.parent(false))); + xIdent(new FTPContentIdentifier(m_aFTPURL.parent())); return Reference<XInterface>( m_xProvider->queryContent(xIdent), UNO_QUERY ); } diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 3fc1755..f3b7484 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -1392,8 +1392,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( std::vector< OUString > aHeaderNames; ContentProperties::UCBNamesToHTTPNames( rProperties, - aHeaderNames, - true /* bIncludeUnmatched */ ); + aHeaderNames ); if ( !aHeaderNames.empty() ) { @@ -2857,7 +2856,7 @@ void Content::lock( ; } - cancelCommandExecution( e, Environment, false ); + cancelCommandExecution( e, Environment ); // Unreachable } } @@ -2906,7 +2905,7 @@ void Content::unlock( //fallthrough ; } - cancelCommandExecution( e, Environment, false ); + cancelCommandExecution( e, Environment ); // Unreachable } } diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx index e801c74..216d2c3 100644 --- a/uui/source/authfallbackdlg.cxx +++ b/uui/source/authfallbackdlg.cxx @@ -55,6 +55,6 @@ IMPL_LINK ( AuthFallbackDlg, OKHdl, Button *, ) IMPL_LINK ( AuthFallbackDlg, CancelHdl, Button *, ) { - EndDialog( RET_CANCEL ); + EndDialog(); return 0; } diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 8af1a4e..cb661be 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -154,7 +154,7 @@ IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl) IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl) { - EndDialog( RET_CANCEL ); + EndDialog(); return 0; } diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx index 731882c..f51606e 100644 --- a/uui/source/unknownauthdlg.cxx +++ b/uui/source/unknownauthdlg.cxx @@ -36,7 +36,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl) EndDialog( RET_OK ); } else { - EndDialog( RET_CANCEL ); + EndDialog(); } return 1; diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index bb77762..42056ce 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -366,7 +366,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) : else fprintf( stderr, "Warning: could not reposition status window since no frame\n" ); #endif - EnableAlwaysOnTop( true ); + EnableAlwaysOnTop(); } void IIIMPStatusWindow::layout() diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index d11e520..8dacdd8 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -736,7 +736,7 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemP SAL_FRAME_STYLE_INTRO | SAL_FRAME_STYLE_PARTIAL_FULLSCREEN) ) == SAL_FRAME_STYLE_DEFAULT ) - pDisplay_->getWMAdaptor()->maximizeFrame( this, true, true ); + pDisplay_->getWMAdaptor()->maximizeFrame( this, true ); if( !netwm_icon.empty() && GetDisplay()->getWMAdaptor()->getAtom( WMAdaptor::NET_WM_ICON )) XChangeProperty( GetXDisplay(), mhWindow, @@ -2033,7 +2033,7 @@ void X11SalFrame::Maximize() nShowState_ = SHOWSTATE_NORMAL; } - pDisplay_->getWMAdaptor()->maximizeFrame( this, true, true ); + pDisplay_->getWMAdaptor()->maximizeFrame( this, true ); } void X11SalFrame::Restore() diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index 63b33c9..7512815 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -135,7 +135,7 @@ wrapper_factory_create_accessible( GObject *obj ) if( pWindow ) { - uno::Reference< accessibility::XAccessible > xAccessible = pWindow->GetAccessible(true); + uno::Reference< accessibility::XAccessible > xAccessible = pWindow->GetAccessible(); if( xAccessible.is() ) { AtkObject *accessible = ooo_wrapper_registry_get( xAccessible ); diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index 635645f..a55312e 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -188,7 +188,7 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data) { init_from_window( obj, pWindow ); - Reference< XAccessible > xAccessible( pWindow->GetAccessible(true) ); + Reference< XAccessible > xAccessible( pWindow->GetAccessible() ); /* We need the wrapper object for the top-level XAccessible to be * in the wrapper registry when atk traverses the hierarchy up on diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index f1abaa8..6bc25f3 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -937,7 +937,7 @@ GtkSalFrame::~GtkSalFrame() void GtkSalFrame::moveWindow( long nX, long nY ) { - if( isChild( false, true ) ) + if( isChild( false ) ) { if( m_pParent ) gtk_fixed_move( m_pParent->getFixedContainer(), @@ -972,7 +972,7 @@ void GtkSalFrame::window_resize(long nWidth, long nHeight) void GtkSalFrame::resizeWindow( long nWidth, long nHeight ) { - if( isChild( false, true ) ) + if( isChild( false ) ) { widget_set_size_request(nWidth, nHeight); } @@ -2132,7 +2132,7 @@ void GtkSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u maGeometry.nWidth = nWidth; maGeometry.nHeight = nHeight; - if( isChild( false, true ) ) + if( isChild( false ) ) widget_set_size_request(nWidth, nHeight); else if( ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) ) window_resize(nWidth, nHeight); @@ -2737,7 +2737,7 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags ) { if( m_pWindow ) { - if( isChild( false, true ) ) + if( isChild( false ) ) gtk_widget_grab_focus( m_pWindow ); else if( IS_WIDGET_MAPPED( m_pWindow ) ) { @@ -2789,7 +2789,7 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle ) // #i80791# use grabPointer the same way as CaptureMouse, respective float grab if( getDisplay()->MouseCaptured( this ) ) - grabPointer( true, false ); + grabPointer( true ); else if( m_nFloats > 0 ) grabPointer( true, true ); } @@ -2904,7 +2904,7 @@ void GtkSalFrame::CaptureMouse( bool bCapture ) void GtkSalFrame::SetPointerPos( long nX, long nY ) { GtkSalFrame* pFrame = this; - while( pFrame && pFrame->isChild( false, true ) ) + while( pFrame && pFrame->isChild( false ) ) pFrame = pFrame->m_pParent; if( ! pFrame ) return; @@ -4676,7 +4676,7 @@ static uno::Reference<accessibility::XAccessibleEditableText> lcl_GetxText(vcl:: uno::Reference<accessibility::XAccessibleEditableText> xText; try { - uno::Reference< accessibility::XAccessible > xAccessible( pFocusWin->GetAccessible( true ) ); + uno::Reference< accessibility::XAccessible > xAccessible( pFocusWin->GetAccessible() ); if (xAccessible.is()) xText = FindFocus(xAccessible->getAccessibleContext()); } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index d398153..b030d3d 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -4708,7 +4708,7 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) // It turns out \li should reset the \fi inherited from the stylesheet. // So set the direct formatting to zero, if we don't have such direct formatting yet. lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, NS_ooxml::LN_CT_PPrBase_ind, NS_ooxml::LN_CT_Ind_firstLine, std::make_shared<RTFValue>(0), - RTFOverwrite::NO_IGNORE, /*bAttribute=*/true); + RTFOverwrite::NO_IGNORE); } break; case RTF_RI: commit fa12df37f42994cd172ec62be936e84ab01a6cf7 Author: Noel Grandin <n...@peralex.com> Date: Fri Aug 21 09:06:55 2015 +0200 loplugin: defaultparams Change-Id: I74d5ce7a23b87bed2ecffc8351dc15a9f0a68ed7 diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx index 4300404..ea4edfd 100644 --- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx +++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx @@ -536,7 +536,7 @@ void PagePropertyPanel::NotifyItemUpdate( case SID_ATTR_PAGE_SIZE: if ( mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify ) { - mpBindings->Invalidate( SID_ATTR_PAGE, true, false ); + mpBindings->Invalidate( SID_ATTR_PAGE, true ); } if ( eState >= SfxItemState::DEFAULT && pState && pState->ISA(SvxSizeItem) ) diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index c2e7406..a0457f0 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -430,7 +430,7 @@ void applyTheme(SfxStyleSheetBasePool* pPool, const OUString& sFontSetName, cons std::vector<ColorSet> aColorSets = initColorSets(); ColorSet aColorSet = getColorSet(sColorSetName, aColorSets); - pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL); + pPool->SetSearchMask(SFX_STYLE_FAMILY_PARA); pStyle = static_cast<SwDocStyleSheet*>(pPool->First()); while (pStyle) @@ -449,7 +449,7 @@ void applyTheme(SfxStyleSheetBasePool* pPool, const OUString& sFontSetName, cons pStyle = static_cast<SwDocStyleSheet*>(pPool->Next()); } - pPool->SetSearchMask(SFX_STYLE_FAMILY_CHAR, SFXSTYLEBIT_ALL); + pPool->SetSearchMask(SFX_STYLE_FAMILY_CHAR); pStyle = static_cast<SwDocStyleSheet*>(pPool->First()); while (pStyle) diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index a21b168..cefeea7 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -210,11 +210,11 @@ uno::Reference< frame::XModel > SwTableFUNC::InsertChart( aName = pSh->GetTableFormat()->GetName(); // insert node before table pSh->MoveTable( fnTableCurr, fnTableStart ); - pSh->Up( false, 1, false ); + pSh->Up( false, 1 ); if ( pSh->IsCrsrInTable() ) { if ( aName != pSh->GetTableFormat()->GetName() ) - pSh->Down( false, 1, false ); // two adjacent tables + pSh->Down( false ); // two adjacent tables } pSh->SplitNode(); } diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx index 695d62a..df1da59 100644 --- a/sw/source/uibase/uiview/formatclipboard.cxx +++ b/sw/source/uibase/uiview/formatclipboard.cxx @@ -276,7 +276,7 @@ void SwFormatClipboard::Copy( SwWrtShell& rWrtShell, SfxItemPool& rPool, bool bP int nSelectionType = rWrtShell.GetSelectionType(); SfxItemSet* pItemSet_TextAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool, true ); - SfxItemSet* pItemSet_ParAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool, false ); + SfxItemSet* pItemSet_ParAttr = lcl_CreateEmptyItemSet( nSelectionType, rPool ); rWrtShell.StartAction(); rWrtShell.Push(); @@ -511,7 +511,7 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo { // temporary SfxItemSet boost::scoped_ptr<SfxItemSet> pTemplateItemSet(lcl_CreateEmptyItemSet( - nSelectionType, *m_pItemSet_ParAttr->GetPool(), false)); + nSelectionType, *m_pItemSet_ParAttr->GetPool())); // no need to verify the existence of pTemplateItemSet as we // know that here the selection type is SEL_TXT diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 39ed4bc..0daf307 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -626,7 +626,7 @@ void SwPagePreview::_ExecPgUpAndPgDown( const bool _bPgUp, const int eMvMode = _bPgUp ? SwPagePreviewWin::MV_PAGE_UP : SwPagePreviewWin::MV_PAGE_DOWN; - if ( ChgPage( eMvMode, true ) ) + if ( ChgPage( eMvMode ) ) pViewWin->Invalidate(); } else @@ -856,7 +856,7 @@ void SwPagePreview::Execute( SfxRequest &rReq ) { pViewWin->SetSelectedPage( nNewSelectedPage ); pViewWin->SetSttPage( nNewStartPage ); - bRefresh = ChgPage( SwPagePreviewWin::MV_SELPAGE, true ); + bRefresh = ChgPage( SwPagePreviewWin::MV_SELPAGE ); } GetViewShell()->ShowPreviewSelection( nNewSelectedPage ); // invalidate page status. @@ -890,7 +890,7 @@ void SwPagePreview::Execute( SfxRequest &rReq ) eMvMode = SwPagePreviewWin::MV_DOC_END; bRetVal = true; goto MOVEPAGE; MOVEPAGE: { - bool nRet = ChgPage( eMvMode, true ); + bool nRet = ChgPage( eMvMode ); // return value fuer Basic if(bRetVal) rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), !nRet)); @@ -1199,7 +1199,7 @@ SwPagePreview::SwPagePreview(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh): { pVS = static_cast<SwView*>(pOldSh)->GetWrtShellPtr(); // save the current ViewData of the previous SwView - pOldSh->WriteUserData( sSwViewData, false ); + pOldSh->WriteUserData( sSwViewData ); } else pVS = GetDocShell()->GetWrtShell(); @@ -1263,7 +1263,7 @@ int SwPagePreview::_CreateScrollbar( bool bHori ) ppScrollbar = VclPtr<SwScrollbar>::Create( pMDI, bHori ); ScrollDocSzChg(); - ppScrollbar->EnableDrag( true ); + ppScrollbar->EnableDrag(); ppScrollbar->SetEndScrollHdl( LINK( this, SwPagePreview, EndScrollHdl )); ppScrollbar->SetScrollHdl( LINK( this, SwPagePreview, ScrollHdl )); @@ -1545,7 +1545,7 @@ void SwPagePreview::DocSzChgd( const Size &rSz ) if( aVisArea.GetWidth() ) { - ChgPage( SwPagePreviewWin::MV_CALC, true ); + ChgPage( SwPagePreviewWin::MV_CALC ); ScrollDocSzChg(); pViewWin->Invalidate(); diff --git a/sw/source/uibase/uiview/scroll.cxx b/sw/source/uibase/uiview/scroll.cxx index 4ff7d47..d95da36 100644 --- a/sw/source/uibase/uiview/scroll.cxx +++ b/sw/source/uibase/uiview/scroll.cxx @@ -97,7 +97,7 @@ void SwScrollbar::SetAuto(bool bSet) // hide automatically - automatisch versteckt - then show if(!bAuto && bVisible && !ScrollBar::IsVisible()) - ExtendedShow(true); + ExtendedShow(); else if(bAuto) AutoShow(); // or hide automatically } diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 9fd8dd7..8cf556d 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -873,8 +873,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) bool bOld = g_bNoInterrupt; g_bNoInterrupt = true; - m_pHRuler->SetActive( true ); - m_pVRuler->SetActive( true ); + m_pHRuler->SetActive(); + m_pVRuler->SetActive(); SfxViewFrame* pViewFrame = GetViewFrame(); if( pViewFrame->GetFrame().GetParentFrame()) @@ -921,7 +921,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) SAL_WARN_IF( officecfg::Office::Common::Undo::Steps::get() <= 0, "sw", "/org.openoffice.Office.Common/Undo/Steps <= 0"); - m_pWrtShell->DoUndo( true ); + m_pWrtShell->DoUndo(); const bool bBrowse = m_pWrtShell->GetViewOptions()->getBrowseMode(); // Disable "multiple window" @@ -1009,7 +1009,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) m_aTimer.SetTimeoutHdl(LINK(this, SwView, TimeoutHdl)); m_bAttrChgNotified = m_bAttrChgNotifiedWithRegistrations = false; if(bOldModifyFlag) - pDocSh->EnableSetModified( true ); + pDocSh->EnableSetModified(); InvalidateBorder(); if( !m_pHScrollbar->IsVisible( true ) ) diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx index 5abd3b1..9fb3bd9 100644 --- a/sw/source/uibase/uiview/view1.cxx +++ b/sw/source/uibase/uiview/view1.cxx @@ -66,8 +66,8 @@ void SwView::Activate(bool bMDIActivate) m_pWrtShell->MakeSelVisible(); m_bMakeSelectionVisible = false; } - m_pHRuler->SetActive( true ); - m_pVRuler->SetActive( true ); + m_pHRuler->SetActive(); + m_pVRuler->SetActive(); if ( bMDIActivate ) { @@ -75,7 +75,7 @@ void SwView::Activate(bool bMDIActivate) if( !m_sSwViewData.isEmpty() ) { - ReadUserData(m_sSwViewData, false); + ReadUserData(m_sSwViewData); m_sSwViewData.clear(); } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index c993fbb..a85fbf9 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -800,7 +800,7 @@ void SwView::Execute(SfxRequest &rReq) break; case FN_SYNC_LABELS: case FN_MAILMERGE_CHILDWINDOW: - GetViewFrame()->ShowChildWindow(nSlot, true); + GetViewFrame()->ShowChildWindow(nSlot); break; case FN_ESCAPE: { @@ -1080,7 +1080,7 @@ void SwView::Execute(SfxRequest &rReq) if(pVFrame->HasChildWindow(SID_BROWSER)) { const SwDBData& rData = GetWrtShell().GetDBDesc(); - SwModule::ShowDBObj(*this, rData, false); + SwModule::ShowDBObj(*this, rData); } } break; @@ -1931,8 +1931,7 @@ bool SwView::JumpToSwMark( const OUString& rMark ) const SwFormatINetFormat* pINet; OUString sCmp; OUString sMark( INetURLObject::decode( rMark, - INetURLObject::DECODE_WITH_CHARSET, - RTL_TEXTENCODING_UTF8 )); + INetURLObject::DECODE_WITH_CHARSET )); sal_Int32 nLastPos, nPos = sMark.indexOf( cMarkSeparator ); if( -1 != nPos ) diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 1758a2f..4980439 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -234,14 +234,14 @@ void SwView::StartTextConversion( return; } - SpellKontext(true); + SpellKontext(); const SwViewOption* pVOpt = m_pWrtShell->GetViewOptions(); const bool bOldIdle = pVOpt->IsIdle(); pVOpt->SetIdle( false ); bool bOldIns = m_pWrtShell->IsInsMode(); - m_pWrtShell->SetInsMode( true ); + m_pWrtShell->SetInsMode(); const bool bSelection = static_cast<SwCrsrShell*>(m_pWrtShell)->HasSelection() || m_pWrtShell->GetCrsr() != m_pWrtShell->GetCrsr()->GetNext(); @@ -501,7 +501,7 @@ OUString SwView::GetThesaurusLookUpText( bool bSelection ) const void SwView::InsertThesaurusSynonym( const OUString &rSynonmText, const OUString &rLookUpText, bool bSelection ) { bool bOldIns = m_pWrtShell->IsInsMode(); - m_pWrtShell->SetInsMode( true ); + m_pWrtShell->SetInsMode(); m_pWrtShell->StartAllAction(); m_pWrtShell->StartUndo(UNDO_DELETE); @@ -898,7 +898,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox ) (*pFieldmark->GetParameters())[ sKey ] = makeAny(selection); pFieldmark->Invalidate(); SwView& rView = static_cast<SwEditWin*>( GetParent() )->GetView(); - rView.GetDocShell()->SetModified( true ); + rView.GetDocShell()->SetModified(); } EndPopupMode(); diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 83694f6..e27caff 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -152,7 +152,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType, { pUsrPref->SetZoom(nZoomFac); pUsrPref->SetZoomType(eZoomType); - SW_MOD()->ApplyUsrPref(*pUsrPref, 0, 0); + SW_MOD()->ApplyUsrPref(*pUsrPref, 0); pUsrPref->SetModified(); } if ( pOpt->GetZoom() != nZoomFac ) @@ -226,7 +226,7 @@ void SwView::SetViewLayout( sal_uInt16 nColumns, bool bBookMode, bool bViewOnly { pUsrPref->SetViewLayoutColumns(nColumns); pUsrPref->SetViewLayoutBookMode(bBookMode); - SW_MOD()->ApplyUsrPref(*pUsrPref, 0, 0); + SW_MOD()->ApplyUsrPref(*pUsrPref, 0); pUsrPref->SetModified(); } } @@ -302,7 +302,7 @@ int SwView::_CreateScrollbar( bool bHori ) ppScrollbar->SetScrollHdl( LINK( this, SwView, ScrollHdl )); ppScrollbar->SetEndScrollHdl( LINK( this, SwView, EndScrollHdl )); - ppScrollbar->EnableDrag( true ); + ppScrollbar->EnableDrag(); if(GetWindow()) InvalidateBorder(); @@ -522,7 +522,7 @@ int SwView::CreateVRuler() int SwView::KillVRuler() { m_pVRuler->Hide(); - m_pHRuler->SetBorderPos( 0 ); + m_pHRuler->SetBorderPos(); InvalidateBorder(); return 1; } diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index e7dad98..0560f11 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -338,7 +338,7 @@ void SwView::CheckVisArea() Rectangle aNewVisArea( m_aVisArea ); aNewVisArea.Move( DOCUMENTBORDER - m_aVisArea.Left(), DOCUMENTBORDER - m_aVisArea.Top() ); - SetVisArea( aNewVisArea, true ); + SetVisArea( aNewVisArea ); } } } @@ -603,7 +603,7 @@ long SwView::PhyPageUp() long SwView::PhyPageDown() { // Check for the currently visible page, do not format - sal_uInt16 nActPage = m_pWrtShell->GetNextPrevPageNum( true ); + sal_uInt16 nActPage = m_pWrtShell->GetNextPrevPageNum(); // If the last page of the document is visible, do nothing. if( USHRT_MAX != nActPage ) { diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx index be077fd..ae97b87 100644 --- a/sw/source/uibase/uiview/viewstat.cxx +++ b/sw/source/uibase/uiview/viewstat.cxx @@ -169,7 +169,7 @@ void SwView::GetState(SfxItemSet &rSet) const SwPageDesc& rDesc = m_pWrtShell->GetPageDesc( nCurIdx ); const SwFrameFormat& rMaster = rDesc.GetMaster(); const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>( - rMaster.GetFormatAttr(RES_BACKGROUND, true)); + rMaster.GetFormatAttr(RES_BACKGROUND)); rSet.Put(rBrush); } break; diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 15d6f26..5289e29 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -253,7 +253,7 @@ SwXAutoTextGroup::~SwXAutoTextGroup() uno::Sequence< OUString > SwXAutoTextGroup::getTitles() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if (!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); const sal_uInt16 nCount = pGlosGroup->GetCount(); @@ -275,7 +275,7 @@ void SwXAutoTextGroup::renameByName(const OUString& aElementName, // throw exception only if the programmatic name is to be changed into an existing name if(aNewElementName != aElementName && hasByName(aNewElementName)) throw container::ElementExistException(); - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if(pGlosGroup && !pGlosGroup->GetError()) { sal_uInt16 nIdx = pGlosGroup->GetIndex( aElementName); @@ -347,7 +347,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const if(!xTextRange.is()) throw uno::RuntimeException(); - SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0; + SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0; OUString sShortName(aName); OUString sLongName(aTitle); if (pGlosGroup && !pGlosGroup->GetError()) @@ -439,7 +439,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if(pGlosGroup && !pGlosGroup->GetError()) { sal_uInt16 nIdx = pGlosGroup->GetIndex(aEntryName); @@ -501,7 +501,7 @@ void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeExcepti sal_Int32 SwXAutoTextGroup::getCount() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if (!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); return static_cast<sal_Int32>(pGlosGroup->GetCount()); @@ -511,7 +511,7 @@ uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if (!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); const sal_uInt16 nCount = pGlosGroup->GetCount(); @@ -529,7 +529,7 @@ uno::Type SwXAutoTextGroup::getElementType() throw( uno::RuntimeException, std:: sal_Bool SwXAutoTextGroup::hasElements() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if (!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); return pGlosGroup->GetCount() > 0; @@ -550,7 +550,7 @@ uno::Sequence< OUString > SwXAutoTextGroup::getElementNames() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if (!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); @@ -568,7 +568,7 @@ sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName) { SolarMutexGuard aGuard; bool bRet = false; - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if (!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); @@ -603,7 +603,7 @@ void SwXAutoTextGroup::setPropertyValue( if(!pEntry) throw beans::UnknownPropertyException(); - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if(!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); switch(pEntry->nWID) @@ -631,7 +631,7 @@ uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName) if(!pEntry) throw beans::UnknownPropertyException(); - boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, false) : 0); + boost::scoped_ptr<SwTextBlocks> pGlosGroup(pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName) : 0); if(!pGlosGroup || pGlosGroup->GetError()) throw uno::RuntimeException(); @@ -782,7 +782,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) { if(SFX_EVENT_PREPARECLOSEDOC == static_cast< const SfxEventHint& >( _rHint ).GetEventId()) { - implFlushDocument( false ); + implFlushDocument(); xBodyText = 0; EndListening( *&xDocSh ); xDocSh.Clear(); @@ -899,7 +899,7 @@ void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextR // is stored somewhere. And below, we're not working with our copy, but only tell the target // TextRange to work with the stored version. // #96380# - 2003-03-03 - f...@openoffice.org - implFlushDocument( false ); + implFlushDocument(); // TODO: think about if we should pass "true" here // The difference would be that when the next modification is made to this instance here, then // we would be forced to open the document again, instead of working on our current copy. diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index adae6c2..6c560d8 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -164,8 +164,7 @@ namespace p->sText, INetURLObject::decode( p->rINetAttr.GetINetFormat().GetValue(), - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 ), + INetURLObject::DECODE_UNAMBIGUOUS ), &p->rINetAttr, n ); pMember->insert( pCnt ); @@ -577,8 +576,7 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) pWrtShell->GetGrfNms( &sLink, 0, static_cast<const SwFlyFrameFormat*>( pFrameFormat)); pCnt = new SwGraphicContent(this, sFrmName, INetURLObject::decode( sLink, - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 ), + INetURLObject::DECODE_UNAMBIGUOUS ), pFrameFormat->FindLayoutRect(false, &aNullPt).Top()); } else @@ -916,7 +914,7 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const { if( pActiveShell && pActiveShell->GetDoc() ) { - const SwFlyFrameFormat* pFrameFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0); + const SwFlyFrameFormat* pFrameFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName()); if( pFrameFormat ) { // SwNodeIndex aIdx( *(pFrameFormat->GetContent().GetContentIdx()), 1 ); @@ -932,7 +930,7 @@ OUString SwContentTree::GetEntryAltText( SvTreeListEntry* pEntry ) const case CONTENT_TYPE_FRAME : { //Can't find the GetAlternateText function. Need to verify again. - const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0); + const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName()); if( pFlyFormat ) return pFlyFormat->/*GetAlternateText*/GetName(); } @@ -1009,7 +1007,7 @@ OUString SwContentTree::GetEntryLongDescription( SvTreeListEntry* pEntry ) const case CONTENT_TYPE_FRAME : { //Can't find the function "GetLongDescription". Need to verify again. - const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName(), 0); + const SwFlyFrameFormat* pFlyFormat = pActiveShell->GetDoc()->FindFlyByName( pCnt->GetName()); if( pFlyFormat ) return pFlyFormat->GetDescription(); } diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 8b5700d..52c1764 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -548,7 +548,7 @@ void SwNavigationPI::_ZoomOut() } SvTreeListEntry* pFirst = aContentTree->FirstSelected(); if(pFirst) - aContentTree->Select(pFirst, true); // Enable toolbox + aContentTree->Select(pFirst); // Enable toolbox pConfig->SetSmall( false ); aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX); } @@ -577,7 +577,7 @@ void SwNavigationPI::_ZoomIn() pFloat->SetOutputSizePixel(aSz); SvTreeListEntry* pFirst = aContentTree->FirstSelected(); if(pFirst) - aContentTree->Select(pFirst, true); // Enable toolbox + aContentTree->Select(pFirst); // Enable toolbox pConfig->SetSmall( true ); aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX, false); } @@ -763,7 +763,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, DragDropMode::ENABLE_TOP ); aContentTree->EnableAsyncDrag(true); aContentTree->ShowTree(); - aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX, true); + aContentToolBox->CheckItem(FN_SHOW_CONTENT_BOX); // TreeListBox for global document aGlobalTree->setPosSizePixel( 0, nListboxYPos, 0, 0, PosSizeFlags::Y ); @@ -784,7 +784,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aContentToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) ); aGlobalToolBox->SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) ); aGlobalToolBox->SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) ); - aGlobalToolBox->CheckItem(FN_GLOBAL_SWITCH, true); + aGlobalToolBox->CheckItem(FN_GLOBAL_SWITCH); vcl::Font aFont(GetFont()); aFont.SetWeight(WEIGHT_NORMAL); @@ -1300,7 +1300,7 @@ SwNavigationChild::SwNavigationChild( vcl::Window* pParent, if( nRootType < CONTENT_TYPE_MAX ) { pNavi->aContentTree->SetRootType(nRootType); - pNavi->aContentToolBox->CheckItem(FN_SHOW_ROOT, true); + pNavi->aContentToolBox->CheckItem(FN_SHOW_ROOT); } pNavi->aContentTree->SetOutlineLevel( static_cast< sal_uInt8 >( pNaviConfig->GetOutlineLevel() ) ); pNavi->SetRegionDropMode( static_cast< sal_uInt16 >( pNaviConfig->GetRegionMode() ) ); diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index d226e20..282a85c 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -104,7 +104,7 @@ void SwTemplateControl::Command( const CommandEvent& rCEvt ) { SfxStyleSheetBasePool* pPool = pView->GetDocShell()-> GetStyleSheetPool(); - pPool->SetSearchMask(SFX_STYLE_FAMILY_PAGE, SFXSTYLEBIT_ALL); + pPool->SetSearchMask(SFX_STYLE_FAMILY_PAGE); if( pPool->Count() > 1 ) { sal_uInt16 nCount = 0; diff --git a/sw/source/uibase/utlui/uitool.cxx b/sw/source/uibase/utlui/uitool.cxx index 4b4344c..6ed9aea 100644 --- a/sw/source/uibase/utlui/uitool.cxx +++ b/sw/source/uibase/utlui/uitool.cxx @@ -707,7 +707,7 @@ void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bo { const sal_Int32 nOffset = rToFill.GetEntryCount() > 0 ? 1 : 0; SfxStyleSheetBasePool* pPool = pDocSh->GetStyleSheetPool(); - pPool->SetSearchMask(SFX_STYLE_FAMILY_CHAR, SFXSTYLEBIT_ALL); + pPool->SetSearchMask(SFX_STYLE_FAMILY_CHAR); SwDoc* pDoc = pDocSh->GetDoc(); const SfxStyleSheetBase* pBase = pPool->First(); OUString sStandard; @@ -788,7 +788,7 @@ OUString GetAppLangDateTimeString( const DateTime& rDT ) { const SvtSysLocale aSysLocale; const LocaleDataWrapper& rAppLclData = aSysLocale.GetLocaleData(); - OUString sRet = rAppLclData.getDate( rDT ) + " " + rAppLclData.getTime( rDT, false, false ); + OUString sRet = rAppLclData.getDate( rDT ) + " " + rAppLclData.getTime( rDT, false ); return sRet; } diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index c25a372..897d9e7 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -325,7 +325,7 @@ long SwWrtShell::DelRight() have moved to a different cell */ if (pSNdOld != pSNdNew) { - SwCrsrShell::Pop( true ); + SwCrsrShell::Pop(); break; } } diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx index 23a1a28..4d93e8b 100644 --- a/sw/source/uibase/wrtsh/move.cxx +++ b/sw/source/uibase/wrtsh/move.cxx @@ -89,7 +89,7 @@ bool SwWrtShell::SimpleMove( FNSimpleMove FnSimpleMove, bool bSelect ) EndCrsrMove(); } else if( ( nRet = (this->*FnSimpleMove)() ) ) - MoveCrsr( false ); + MoveCrsr(); return nRet; } diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index a034996..b564332 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -221,7 +221,7 @@ sal_uLong SwWrtShell::SearchPattern( const SearchOptions& rSearchOpt, bool bSear sal_uLong nRet = Find( rSearchOpt, bSearchInNotes, eStt, eEnd, bCancel, eFlags, bReplace ); if(bCancel) { - Undo(1); + Undo(); nRet = ULONG_MAX; } return nRet; @@ -246,7 +246,7 @@ sal_uLong SwWrtShell::SearchTempl( const OUString &rTempl, eStt,eEnd, bCancel, eFlags, pReplaceColl); if(bCancel) { - Undo(1); + Undo(); nRet = ULONG_MAX; } return nRet; @@ -269,7 +269,7 @@ sal_uLong SwWrtShell::SearchAttr( const SfxItemSet& rFindSet, bool bNoColls, if(bCancel) { - Undo(1); + Undo(); nRet = ULONG_MAX; } return nRet; @@ -400,11 +400,11 @@ void SwWrtShell::EndSelect() m_bInSelect = false; if (m_bAddMode) { - AddLeaveSelect(0, false); + AddLeaveSelect(0); } else { - SttLeaveSelect(0, false); + SttLeaveSelect(0); m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel; m_fnKillSel = &SwWrtShell::ResetSelect; } @@ -656,7 +656,7 @@ void SwWrtShell::SetRedlineModeAndCheckInsMode( sal_uInt16 eMode ) { SetRedlineMode( eMode ); if (IsRedlineOn()) - SetInsMode( true ); + SetInsMode(); } // Edit frame diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 9a691ad..76d905c 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -690,7 +690,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj, if ( bResetEnableSetModified ) { - GetDoc()->GetDocShell()->EnableSetModified( true ); + GetDoc()->GetDocShell()->EnableSetModified(); } } } commit b0dcd6dbad43c1f7e45240687735b1127acad3ec Author: Noel Grandin <n...@peralex.com> Date: Fri Aug 21 09:04:54 2015 +0200 loplugin: defaultparams Change-Id: Id6466f7c6d333ecf157c1de4197df394b60d0627 diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx index 301a98e..fb33ad4 100644 --- a/sw/source/uibase/shells/beziersh.cxx +++ b/sw/source/uibase/shells/beziersh.cxx @@ -219,7 +219,7 @@ void SwBezierShell::Execute(SfxRequest &rReq) if (pSdrView->GetModel()->IsChanged()) GetShell().SetModified(); else if (bChanged) - pSdrView->GetModel()->SetChanged(true); + pSdrView->GetModel()->SetChanged(); } void SwBezierShell::GetState(SfxItemSet &rSet) diff --git a/sw/source/uibase/shells/drawdlg.cxx b/sw/source/uibase/shells/drawdlg.cxx index 5480857..def6391 100644 --- a/sw/source/uibase/shells/drawdlg.cxx +++ b/sw/source/uibase/shells/drawdlg.cxx @@ -161,7 +161,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq) GetShell().SetModified(); else if (bChanged) - pDoc->SetChanged(true); + pDoc->SetChanged(); } void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq) @@ -210,7 +210,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq) GetShell().SetModified(); else if (bChanged) - pView->GetModel()->SetChanged(true); + pView->GetModel()->SetChanged(); } void SwDrawShell::GetDrawAttrState(SfxItemSet& rSet) diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index d63451d..d3424f6 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -391,7 +391,7 @@ void SwDrawShell::Execute(SfxRequest &rReq) if (pSdrView->GetModel()->IsChanged()) rSh.SetModified(); else if (bChanged) - pSdrView->GetModel()->SetChanged(true); + pSdrView->GetModel()->SetChanged(); } void SwDrawShell::GetState(SfxItemSet& rSet) @@ -570,7 +570,7 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq) rSh.SetModified(); else if (bChanged) - pDrView->GetModel()->SetChanged(true); + pDrView->GetModel()->SetChanged(); } //Return status values for FontWork diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx index 35d2991..1f8157f 100644 --- a/sw/source/uibase/shells/drformsh.cxx +++ b/sw/source/uibase/shells/drformsh.cxx @@ -249,7 +249,7 @@ SwDrawFormShell::SwDrawFormShell(SwView &_rView) : SwDrawBaseShell(_rView) { SetHelpId(SW_DRAWFORMSHELL); - GetShell().NoEdit(true); + GetShell().NoEdit(); SetName(OUString("DrawForm")); SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Form)); } diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx index f2312c3..67f8202 100644 --- a/sw/source/uibase/shells/drwbassh.cxx +++ b/sw/source/uibase/shells/drwbassh.cxx @@ -77,7 +77,7 @@ TYPEINIT1(SwDrawBaseShell,SwBaseShell) SwDrawBaseShell::SwDrawBaseShell(SwView &_rView) : SwBaseShell(_rView) { - GetShell().NoEdit(true); + GetShell().NoEdit(); SwEditWin& rWin = GetView().GetEditWin(); @@ -582,7 +582,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq) if (pSdrView->GetModel()->IsChanged()) pSh->SetModified(); else if (bChanged) - pSdrView->GetModel()->SetChanged(true); + pSdrView->GetModel()->SetChanged(); } } diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index d826f12..8f01692 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -933,7 +933,7 @@ void SwDrawTextShell::GetDrawTextCtrlState(SfxItemSet& rSet) } } if(nEEWhich) - rSet.Put(aEditAttr.Get(nEEWhich, true), nWhich); + rSet.Put(aEditAttr.Get(nEEWhich), nWhich); nWhich = aIter.NextWhich(); } diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index e081614..216c412 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -131,7 +131,7 @@ SwDrawTextShell::SwDrawTextShell(SwView &rV) : Init(); - rSh.NoEdit(true); + rSh.NoEdit(); SetName(OUString("ObjectText")); SetHelpId(SW_DRWTXTSHELL); SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_DrawText)); diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 9442579..cfa9ffe 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -702,7 +702,7 @@ void SwFrameShell::GetState(SfxItemSet& rSet) case RES_PRINT: case RES_SURROUND: { - rSet.Put(aSet.Get(GetPool().GetWhich(nWhich), true )); + rSet.Put(aSet.Get(GetPool().GetWhich(nWhich))); } break; case SID_OBJECT_ALIGN_LEFT : diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index c05d1ce..fb4a14d 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -305,8 +305,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) if( !sGrfNm.isEmpty() ) { aSet.Put( SvxBrushItem( INetURLObject::decode( sGrfNm, - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 ), + INetURLObject::DECODE_UNAMBIGUOUS ), sFilterNm, GPOS_LT, SID_ATTR_GRAF_GRAPHIC )); } diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx index 8c45ea3..e3b6eaa 100644 --- a/sw/source/uibase/shells/langhelper.cxx +++ b/sw/source/uibase/shells/langhelper.cxx @@ -144,20 +144,20 @@ namespace SwLangHelper sal_Int32 nPos = 0; bool bForSelection = true; bool bForParagraph = false; - if (-1 != (nPos = aNewLangText.indexOf( aSelectionLangPrefix, 0 ))) + if (-1 != (nPos = aNewLangText.indexOf( aSelectionLangPrefix ))) { // ... for the current selection aNewLangText = aNewLangText.replaceAt(nPos, aSelectionLangPrefix.getLength(), ""); bForSelection = true; } - else if (-1 != (nPos = aNewLangText.indexOf( aParagraphLangPrefix , 0 ))) + else if (-1 != (nPos = aNewLangText.indexOf( aParagraphLangPrefix ))) { // ... for the current paragraph language aNewLangText = aNewLangText.replaceAt(nPos, aParagraphLangPrefix.getLength(), ""); bForSelection = true; bForParagraph = true; } - else if (-1 != (nPos = aNewLangText.indexOf( aDocumentLangPrefix , 0 ))) + else if (-1 != (nPos = aNewLangText.indexOf( aDocumentLangPrefix ))) { // ... as default document language aNewLangText = aNewLangText.replaceAt(nPos, aDocumentLangPrefix.getLength(), ""); diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx index 404778b..6abddb6 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -142,7 +142,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq) if( pSdrView->GetModel()->IsChanged() ) GetShell().SetModified(); else if( bChanged ) - pSdrView->GetModel()->SetChanged(true); + pSdrView->GetModel()->SetChanged(); } } diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx index 0043e21..c3c3739 100644 --- a/sw/source/uibase/shells/navsh.cxx +++ b/sw/source/uibase/shells/navsh.cxx @@ -69,7 +69,7 @@ void SwNavigationShell::Execute(SfxRequest &rReq) if (pSdrView->GetModel()->IsChanged()) GetShell().SetModified(); else if (bChanged) - pSdrView->GetModel()->SetChanged(true); + pSdrView->GetModel()->SetChanged(); } // determine if the buttons should be enabled/disabled diff --git a/sw/source/uibase/shells/textdrw.cxx b/sw/source/uibase/shells/textdrw.cxx index cef4a08..dc833d3 100644 --- a/sw/source/uibase/shells/textdrw.cxx +++ b/sw/source/uibase/shells/textdrw.cxx @@ -52,7 +52,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, SdrView *pSdrView = rSh.GetDrawView(); // OBJ_FM_BUTTON - pSdrView->SetDesignMode(true); + pSdrView->SetDesignMode(); pSdrView->SetCurrentObj(OBJ_FM_BUTTON); pSdrView->SetEditMode(false); diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 076e5a5..19f7655 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -406,7 +406,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) aFieldMgr.InsertField( aData ); rSh.Push(); - rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, false); + rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS); pPostIt = static_cast<SwPostItField*>(aFieldMgr.GetCurField()); rSh.Pop(false); // Restore cursor position } diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index b479261..c7b0490 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -156,7 +156,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) break; case FN_INSERT_SOFT_HYPHEN: - if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( true, 0 ) && + if( CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( true ) && CHAR_SOFTHYPHEN != rSh.SwCrsrShell::GetChar( true, -1 )) rSh.Insert( OUString( CHAR_SOFTHYPHEN ) ); break; @@ -473,7 +473,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) // the suggestion has to be removed before GetView().GetEditWin().StopQuickHelp(); SvGlobalName aGlobalName( SO3_SM_CLASSID ); - rSh.InsertObject( svt::EmbeddedObjectRef(), &aGlobalName, true, 0 ); + rSh.InsertObject( svt::EmbeddedObjectRef(), &aGlobalName, true ); } break; @@ -1101,17 +1101,17 @@ void SwTextShell::InsertSymbol( SfxRequest& rReq ) nScript = g_pBreakIt->GetAllScriptsOfText( aChars ); if( SvtScriptType::LATIN & nScript ) { - aRestoreSet.Put( aSet.Get( RES_CHRATR_FONT, true ) ); + aRestoreSet.Put( aSet.Get( RES_CHRATR_FONT ) ); aSet.Put( aNewFontItem, RES_CHRATR_FONT); } if( SvtScriptType::ASIAN & nScript ) { - aRestoreSet.Put( aSet.Get( RES_CHRATR_CJK_FONT, true ) ); + aRestoreSet.Put( aSet.Get( RES_CHRATR_CJK_FONT ) ); aSet.Put( aNewFontItem, RES_CHRATR_CJK_FONT ); } if( SvtScriptType::COMPLEX & nScript ) { - aRestoreSet.Put( aSet.Get( RES_CHRATR_CTL_FONT, true ) ); + aRestoreSet.Put( aSet.Get( RES_CHRATR_CTL_FONT ) ); aSet.Put( aNewFontItem, RES_CHRATR_CTL_FONT ); } diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx index 8f5e9cd..245a3c0 100644 --- a/sw/source/uibase/shells/textsh1.cxx +++ b/sw/source/uibase/shells/textsh1.cxx @@ -368,20 +368,20 @@ void SwTextShell::Execute(SfxRequest &rReq) sal_Int32 nPos = 0; bool bForSelection = true; bool bForParagraph = false; - if (-1 != (nPos = aNewLangText.indexOf( aSelectionLangPrefix, 0 ))) + if (-1 != (nPos = aNewLangText.indexOf( aSelectionLangPrefix ))) { // ... for the current selection aNewLangText = aNewLangText.replaceAt(nPos, aSelectionLangPrefix.getLength(), ""); bForSelection = true; } - else if (-1 != (nPos = aNewLangText.indexOf(aParagraphLangPrefix, 0))) + else if (-1 != (nPos = aNewLangText.indexOf(aParagraphLangPrefix))) { // ... for the current paragraph language aNewLangText = aNewLangText.replaceAt(nPos, aParagraphLangPrefix.getLength(), ""); bForSelection = true; bForParagraph = true; } - else if (-1 != (nPos = aNewLangText.indexOf(aDocumentLangPrefix, 0))) + else if (-1 != (nPos = aNewLangText.indexOf(aDocumentLangPrefix))) { // ... as default document language aNewLangText = aNewLangText.replaceAt(nPos, aDocumentLangPrefix.getLength(), ""); @@ -484,7 +484,7 @@ void SwTextShell::Execute(SfxRequest &rReq) SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialog creation failed!"); boost::scoped_ptr<AbstractInsFootNoteDlg> pDlg(pFact->CreateInsFootNoteDlg( - GetView().GetWindow(), rWrtSh, false)); + GetView().GetWindow(), rWrtSh)); OSL_ENSURE(pDlg, "Dialog creation failed!"); pDlg->SetHelpId(GetStaticInterface()->GetSlot(nSlot)->GetCommand()); if ( pDlg->Execute() == RET_OK ) @@ -1130,7 +1130,7 @@ void SwTextShell::Execute(SfxRequest &rReq) case FN_SELECT_PARA: { if ( !rWrtSh.IsSttOfPara() ) - rWrtSh.SttPara( false ); + rWrtSh.SttPara(); else rWrtSh.EnterStdMode(); rWrtSh.EndPara( true ); @@ -1303,7 +1303,7 @@ void SwTextShell::Execute(SfxRequest &rReq) case FN_NUM_BULLET_MOVEDOWN: if (!rWrtSh.IsAddMode()) - rWrtSh.MoveParagraph(1); + rWrtSh.MoveParagraph(); rReq.Done(); break; @@ -1366,7 +1366,7 @@ void SwTextShell::Execute(SfxRequest &rReq) rWrtSh.GetCurAttr(aSet); if(SfxItemState::SET <= aSet.GetItemState( RES_TXTATR_INETFMT, true )) { - const SwFormatINetFormat& rINetFormat = dynamic_cast<const SwFormatINetFormat&>( aSet.Get(RES_TXTATR_INETFMT, true) ); + const SwFormatINetFormat& rINetFormat = dynamic_cast<const SwFormatINetFormat&>( aSet.Get(RES_TXTATR_INETFMT) ); if( nSlot == FN_COPY_HYPERLINK_LOCATION ) { ::uno::Reference< datatransfer::clipboard::XClipboard > xClipboard = GetView().GetEditWin().GetClipboard(); @@ -1375,7 +1375,7 @@ void SwTextShell::Execute(SfxRequest &rReq) xClipboard ); } else - rWrtSh.ClickToINetAttr(rINetFormat, URLLOAD_NOFILTER); + rWrtSh.ClickToINetAttr(rINetFormat); } } break; @@ -1585,7 +1585,7 @@ void SwTextShell::GetState( SfxItemSet &rSet ) sal_uInt16 nHtmlMode = ::GetHtmlMode( GetView().GetDocShell() ); nHtmlMode &= HTMLMODE_ON | HTMLMODE_SOME_STYLES; if ( ( nHtmlMode == HTMLMODE_ON ) - || !rSh.IsMoveLeftMargin( SID_INC_INDENT == nWhich, true ) ) + || !rSh.IsMoveLeftMargin( SID_INC_INDENT == nWhich ) ) { rSet.DisableItem( nWhich ); } diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx index 5e5162a..abb34ee 100644 --- a/sw/source/uibase/shells/txtattr.cxx +++ b/sw/source/uibase/shells/txtattr.cxx @@ -728,7 +728,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) const SfxPoolItem& rItem = aCoreSet.Get(GetPool().GetWhich(nSlot), true); rSet.Put(rItem); #else - rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot), true)); + rSet.Put(aCoreSet.Get( GetPool().GetWhich(nSlot))); #endif nSlot = 0; } @@ -749,7 +749,7 @@ void SwTextShell::GetAttrState(SfxItemSet &rSet) { SfxItemSet aSet(GetPool(), RES_TXTATR_INETFMT, RES_TXTATR_INETFMT); rSh.GetCurAttr(aSet); - const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true); + const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT); rSet.Put(rItem); nSlot = 0; } diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx index 40680ef..41c4d84 100644 --- a/sw/source/uibase/shells/txtcrsr.cxx +++ b/sw/source/uibase/shells/txtcrsr.cxx @@ -144,13 +144,13 @@ void SwTextShell::ExecMove(SfxRequest &rReq) bRet = rSh.SttDoc( true ); break; case FN_START_OF_DOCUMENT: - bRet = rSh.SttDoc( false ); + bRet = rSh.SttDoc(); break; case FN_END_OF_DOCUMENT_SEL: bRet = rSh.EndDoc( true ); break; case FN_END_OF_DOCUMENT: - bRet = rSh.EndDoc( false ); + bRet = rSh.EndDoc(); break; case FN_SELECT_WORD: bRet = rSh.SelNearestWrd(); @@ -183,37 +183,37 @@ void SwTextShell::ExecMovePage(SfxRequest &rReq) rSh.SttNxtPg( true ); break; case FN_START_OF_NEXT_PAGE: - rSh.SttNxtPg( false ); + rSh.SttNxtPg(); break; case FN_END_OF_NEXT_PAGE_SEL: rSh.EndNxtPg( true ); break; case FN_END_OF_NEXT_PAGE: - rSh.EndNxtPg( false ); + rSh.EndNxtPg(); break; case FN_START_OF_PREV_PAGE_SEL: rSh.SttPrvPg( true ); break; case FN_START_OF_PREV_PAGE: - rSh.SttPrvPg( false ); + rSh.SttPrvPg(); break; case FN_END_OF_PREV_PAGE_SEL: rSh.EndPrvPg( true ); break; case FN_END_OF_PREV_PAGE: - rSh.EndPrvPg( false ); + rSh.EndPrvPg(); break; case FN_START_OF_PAGE_SEL: rSh.SttPg( true ); break; case FN_START_OF_PAGE: - rSh.SttPg( false ); + rSh.SttPg(); break; case FN_END_OF_PAGE_SEL: rSh.EndPg( true ); break; case FN_END_OF_PAGE: - rSh.EndPg( false ); + rSh.EndPg(); break; default: OSL_FAIL("wrong dispatcher"); @@ -228,22 +228,22 @@ void SwTextShell::ExecMoveCol(SfxRequest &rReq) switch ( rReq.GetSlot() ) { case FN_START_OF_COLUMN: - rSh.StartOfColumn( false ); + rSh.StartOfColumn(); break; case FN_END_OF_COLUMN: - rSh.EndOfColumn( false ); + rSh.EndOfColumn(); break; case FN_START_OF_NEXT_COLUMN: - rSh.StartOfNextColumn( false ) ; + rSh.StartOfNextColumn() ; break; case FN_END_OF_NEXT_COLUMN: - rSh.EndOfNextColumn( false ); + rSh.EndOfNextColumn(); break; case FN_START_OF_PREV_COLUMN: - rSh.StartOfPrevColumn( false ); + rSh.StartOfPrevColumn(); break; case FN_END_OF_PREV_COLUMN: - rSh.EndOfPrevColumn( false ); + rSh.EndOfPrevColumn(); break; default: OSL_FAIL("wrong dispatcher"); @@ -263,43 +263,43 @@ void SwTextShell::ExecMoveLingu(SfxRequest &rReq) rSh.NxtWrd( true ); break; case FN_NEXT_WORD: - rSh.NxtWrd( false ); + rSh.NxtWrd(); break; case FN_START_OF_PARA_SEL: rSh.SttPara( true ); break; case FN_START_OF_PARA: - rSh.SttPara( false ); + rSh.SttPara(); break; case FN_END_OF_PARA_SEL: rSh.EndPara( true ); break; case FN_END_OF_PARA: - rSh.EndPara( false ); + rSh.EndPara(); break; case FN_PREV_WORD_SEL: rSh.PrvWrd( true ); break; case FN_PREV_WORD: - rSh.PrvWrd( false ); + rSh.PrvWrd(); break; case FN_NEXT_SENT_SEL: rSh.FwdSentence( true ); break; case FN_NEXT_SENT: - rSh.FwdSentence( false ); + rSh.FwdSentence(); break; case FN_PREV_SENT_SEL: rSh.BwdSentence( true ); break; case FN_PREV_SENT: - rSh.BwdSentence( false ); + rSh.BwdSentence(); break; case FN_NEXT_PARA: - rSh.FwdPara( false ); + rSh.FwdPara(); break; case FN_PREV_PARA: - rSh.BwdPara( false ); + rSh.BwdPara(); break; default: OSL_FAIL("wrong dispatcher"); @@ -409,16 +409,16 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq) bRet = rSh.MoveRegion(fnRegionPrev, fnRegionStart); break; case FN_NEXT_TOXMARK: - bRet = rSh.GotoNxtPrvTOXMark( true ); + bRet = rSh.GotoNxtPrvTOXMark(); break; case FN_PREV_TOXMARK: bRet = rSh.GotoNxtPrvTOXMark( false ); break; case FN_NEXT_TBLFML: - bRet = rSh.GotoNxtPrvTableFormula( true, false ); + bRet = rSh.GotoNxtPrvTableFormula( true ); break; case FN_PREV_TBLFML: - bRet = rSh.GotoNxtPrvTableFormula( false, false ); + bRet = rSh.GotoNxtPrvTableFormula( false ); break; case FN_NEXT_TBLFML_ERR: bRet = rSh.GotoNxtPrvTableFormula( true, true ); commit 6c5fa17611b8f8f3c94473eabd768f310de3e7ff Author: Noel Grandin <n...@peralex.com> Date: Fri Aug 21 09:03:23 2015 +0200 loplugin: defaultparams Change-Id: I2315996f0fa147615554baf8607882eb32af2f34 diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index be75802..866c2f00 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -217,7 +217,7 @@ IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton ) { if( mpKeepColumn->IsEnabled() ) mpKeepColumn->SaveValue(); - mpKeepColumn->Check( true ); + mpKeepColumn->Check(); } mpKeepColumn->Enable( mpTabBtn->IsChecked() ); mpOtherEd->Enable( mpOtherBtn->IsChecked() ); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 6283bbd..1a490e2 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -483,7 +483,7 @@ void SwFormatTablePage::Reset( const SfxItemSet* ) if(pTableData->GetWidthPercent()) { - m_pRelWidthCB->Check(true); + m_pRelWidthCB->Check(); RelWidthClickHdl(m_pRelWidthCB); m_aWidthMF.SetPrcntValue(pTableData->GetWidthPercent(), FUNIT_CUSTOM); @@ -1564,9 +1564,9 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet ) m_pPageCollCB->Enable(); m_pPgBrkCB->Check(); - m_pPgBrkCB->Check( true ); + m_pPgBrkCB->Check(); m_pColBrkRB->Check( false ); - m_pPgBrkBeforeRB->Check( true ); + m_pPgBrkBeforeRB->Check(); m_pPgBrkAfterRB->Check( false ); } else @@ -1592,28 +1592,28 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet ) switch ( eBreak ) { case SVX_BREAK_PAGE_BEFORE: - m_pPgBrkRB->Check( true ); + m_pPgBrkRB->Check(); m_pColBrkRB->Check( false ); - m_pPgBrkBeforeRB->Check( true ); + m_pPgBrkBeforeRB->Check(); m_pPgBrkAfterRB->Check( false ); break; case SVX_BREAK_PAGE_AFTER: - m_pPgBrkRB->Check( true ); + m_pPgBrkRB->Check(); m_pColBrkRB->Check( false ); m_pPgBrkBeforeRB->Check( false ); - m_pPgBrkAfterRB->Check( true ); + m_pPgBrkAfterRB->Check(); break; case SVX_BREAK_COLUMN_BEFORE: m_pPgBrkRB->Check( false ); - m_pColBrkRB->Check( true ); - m_pPgBrkBeforeRB->Check( true ); + m_pColBrkRB->Check(); + m_pPgBrkBeforeRB->Check(); m_pPgBrkAfterRB->Check( false ); break; case SVX_BREAK_COLUMN_AFTER: m_pPgBrkRB->Check( false ); - m_pColBrkRB->Check( true ); + m_pColBrkRB->Check(); m_pPgBrkBeforeRB->Check( false ); - m_pPgBrkAfterRB->Check( true ); + m_pPgBrkAfterRB->Check(); break; default:; //prevent warning } diff --git a/sw/source/ui/vba/vbatablehelper.cxx b/sw/source/ui/vba/vbatablehelper.cxx index 8a96054..84e3463 100644 --- a/sw/source/ui/vba/vbatablehelper.cxx +++ b/sw/source/ui/vba/vbatablehelper.cxx @@ -162,7 +162,7 @@ void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const SwTableBox *pStart, rCols.SetLeft ( 0 ); rCols.SetRight ( UNO_TABLE_COLUMN_SUM ); rCols.SetRightMax( UNO_TABLE_COLUMN_SUM ); - pTable->GetTabCols( rCols, pStart, false, false ); + pTable->GetTabCols( rCols, pStart, false ); } sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols& rCols ) diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index f4fcb42..cd19bc6 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -454,7 +454,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) // Move Flys to the "old" pages if (!aFlyArr.empty()) - pSh->SetPageObjsNewPage(aFlyArr, 1); + pSh->SetPageObjsNewPage(aFlyArr); // Finished pSh->SttEndDoc(true); @@ -462,7 +462,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) pSh->EndAllAction(); if (nMode == ENV_NEWDOC) - pSh->DoUndo(true); + pSh->DoUndo(); else pSh->EndUndo(UNDO_UI_INSERT_ENVELOPE); diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index f7778b3..454ac3d 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -389,7 +389,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) pSh->GotoFly(pFirstFlyFormat->GetName(), FLYCNTTYPE_ALL, false); pSh->EndAllAction(); - pSh->DoUndo( true ); + pSh->DoUndo(); } if( rItem.aWriting.indexOf( '<' ) >= 0 ) diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 7a3d9be..e1237d3 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -795,7 +795,7 @@ bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor DELETEZ(m_pOLEChildList); if( bResetModified ) - EnableSetModified( true ); + EnableSetModified(); } return bRet; } @@ -840,7 +840,7 @@ void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup, delete pOrig; } if ( bResetModified ) - EnableSetModified( true ); + EnableSetModified(); } void SwDocShell::SetVisArea( const Rectangle &rRect ) @@ -861,7 +861,7 @@ void SwDocShell::SetVisArea( const Rectangle &rRect ) aRect.Move( nMoveX, nMoveY ); // Calls SfxInPlaceObject::SetVisArea()! - m_pView->SetVisArea( aRect, true ); + m_pView->SetVisArea( aRect ); } else SfxObjectShell::SetVisArea( aRect ); @@ -875,7 +875,7 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const SwNodeIndex aIdx( m_pDoc->GetNodes().GetEndOfExtras(), 1 ); SwContentNode* pNd = m_pDoc->GetNodes().GoNext( &aIdx ); - const SwRect aPageRect = pNd->FindPageFrmRect( false, 0, false ); + const SwRect aPageRect = pNd->FindPageFrmRect( false, 0 ); return aPageRect.SVRect(); } return SfxObjectShell::GetVisArea( nAspect ); diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 8037523..1f28a9f 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -304,7 +304,7 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) if ( !bIsDocModified ) m_pDoc->getIDocumentState().ResetModified(); if ( bResetModified ) - EnableSetModified( true ); + EnableSetModified(); } break; } @@ -1129,7 +1129,7 @@ void SwDocShell::Execute(SfxRequest& rReq) pViewShell = pVFrame ? pVFrame->GetViewShell() : 0; pCurrView = dynamic_cast<SwView*>( pViewShell ); } - m_pDoc->GetNumberFormatter(true)->SetYear2000(nYear2K); + m_pDoc->GetNumberFormatter()->SetYear2000(nYear2K); } break; case FN_OPEN_FILE: @@ -1234,7 +1234,7 @@ void SwDocShell::SetModified( bool bSet ) else m_pDoc->getIDocumentState().ResetModified(); - EnableSetModified( true ); + EnableSetModified(); } UpdateChildWindows(); @@ -1391,12 +1391,12 @@ sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL, // search for filter in WebDocShell, too SfxMedium aMed( rURL, STREAM_STD_READ ); const SfxFilter* pFlt = 0; - aMatcher.DetectFilter( aMed, &pFlt, false, false ); + aMatcher.DetectFilter( aMed, &pFlt, false ); if(!pFlt) { OUString sWebFactory(OUString::createFromAscii(SwWebDocShell::Factory().GetShortName())); SfxFilterMatcher aWebMatcher( sWebFactory ); - aWebMatcher.DetectFilter( aMed, &pFlt, false, false ); + aWebMatcher.DetectFilter( aMed, &pFlt, false ); } // --> OD #i117339# - trigger import only for own formats bool bImport( false ); @@ -1566,7 +1566,7 @@ int SwFindDocShell( SfxObjectShellRef& xDocSh, pMed->GetItemSet()->Put( SfxStringItem( SID_PASSWORD, rPasswd )); if( !pSfxFlt ) - aMatcher.DetectFilter( *pMed, &pSfxFlt, false, false ); + aMatcher.DetectFilter( *pMed, &pSfxFlt, false ); if( pSfxFlt ) { diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index a6407ed..9815b98 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -817,7 +817,7 @@ sal_uInt16 SwDocShell::Edit( { if( bNew ) { - GetWrtShell()->Undo(1); + GetWrtShell()->Undo(); m_pDoc->GetIDocumentUndoRedo().ClearRedo(); } diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 6c1411a..a66148c 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -1182,7 +1182,7 @@ SfxItemSet& SwDocStyleSheet::GetItemSet() aBoxInfo.SetMinDist( true );// set minimum size in tables and paragraphs aBoxInfo.SetDefDist( MIN_BORDER_DIST );// always set Default-Gap // Single lines can only have DontCare-Status in tables - aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE, true ); + aBoxInfo.SetValid( SvxBoxInfoItemValidFlags::DISABLE ); if( nFamily == SFX_STYLE_FAMILY_CHAR ) { @@ -1342,7 +1342,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, const OUString sStyle = pCondItem->GetStyle( i ); if (sStyle.isEmpty()) continue; - SwFormat *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0, true ); + SwFormat *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0 ); if (pFindFormat) { aCond.RegisterToFormat( *pFindFormat ); @@ -1374,7 +1374,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet, const OUString sStyle = pCondItem->GetStyle( i ); if (sStyle.isEmpty()) continue; - SwTextFormatColl *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0, true ); + SwTextFormatColl *const pFindFormat = lcl_FindParaFormat( rDoc, sStyle, 0 ); if (pFindFormat) { pCColl->InsertCondition( SwCollCondition( pFindFormat, @@ -1723,7 +1723,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pCharFormat = lcl_FindCharFormat(rDoc, aName, this, true ); + pCharFormat = lcl_FindCharFormat(rDoc, aName, this ); } pFormat = pCharFormat; @@ -1750,7 +1750,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pColl = lcl_FindParaFormat(rDoc, aName, this, true ); + pColl = lcl_FindParaFormat(rDoc, aName, this ); } pFormat = pColl; @@ -1773,7 +1773,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pFrameFormat = lcl_FindFrameFormat(rDoc, aName, this, true ); + pFrameFormat = lcl_FindFrameFormat(rDoc, aName, this ); } pFormat = pFrameFormat; if( !bCreate && !pFormat ) @@ -1792,7 +1792,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pDesc = lcl_FindPageDesc( rDoc, aName, this, true ); + pDesc = lcl_FindPageDesc( rDoc, aName, this ); } if( pDesc ) @@ -1820,7 +1820,7 @@ bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) { bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); - pNumRule = lcl_FindNumRule( rDoc, aName, this, true ); + pNumRule = lcl_FindNumRule( rDoc, aName, this ); } if( pNumRule ) @@ -1898,7 +1898,7 @@ void SwDocStyleSheet::Create() if( !pCharFormat ) pCharFormat = rDoc.MakeCharFormat(aName, rDoc.GetDfltCharFormat()); - pCharFormat->SetAuto( false ); + pCharFormat->SetAuto(); break; case SFX_STYLE_FAMILY_PARA : @@ -2833,7 +2833,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::Next() mxIterSheet->SetMask( nMask ); if(mxIterSheet->pSet) { - mxIterSheet->pSet->ClearItem(0); + mxIterSheet->pSet->ClearItem(); mxIterSheet->pSet= 0; } return mxIterSheet.get(); diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index 1dc1d29..d6aaa23 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -133,7 +133,7 @@ SwView* SwModule::GetNextView(SwView* pView) { OSL_ENSURE(PTR_CAST(SwView, pView),"return no SwView"); const TypeId aTypeId = TYPE(SwView); - SwView* pNView = static_cast<SwView*>(SfxViewShell::GetNext(*pView, &aTypeId, true)); + SwView* pNView = static_cast<SwView*>(SfxViewShell::GetNext(*pView, &aTypeId)); return pNView; } diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx index 7ac2915..4c33c07 100644 --- a/sw/source/uibase/config/uinums.cxx +++ b/sw/source/uibase/config/uinums.cxx @@ -256,7 +256,7 @@ void SwNumRulesWithName::_SwNumFormatGlobal::ChgNumFormat( SwWrtShell& rSh, if( IsPoolUserFormat( nCharPoolId ) ) { pFormat = rSh.MakeCharFormat( sCharFormatName ); - pFormat->SetAuto( false ); + pFormat->SetAuto(); } else pFormat = rSh.GetCharFormatFromPool( nCharPoolId ); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index a5c9701..912f274 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1309,7 +1309,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, } } pWorkView->StartPrint( aOptions, IsMergeSilent(), rMergeDescriptor.bPrintAsync ); - SfxPrinter* pDocPrt = pWorkView->GetPrinter(false); + SfxPrinter* pDocPrt = pWorkView->GetPrinter(); JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : SfxViewShell::GetJobSetup(); Printer::PreparePrintJob( pWorkView->GetPrinterController(), aJobSetup ); #if ENABLE_CUPS && !defined(MACOSX) @@ -2637,8 +2637,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(const DBConnURITypes type, const uno::Reference<sdb::XDatabaseContext> xDBContext = sdb::DatabaseContext::create(xContext); OUString sNewName = INetURLObject::decode( aURL.getName(), - INetURLObject::DECODE_UNAMBIGUOUS, - RTL_TEXTENCODING_UTF8 ); + INetURLObject::DECODE_UNAMBIGUOUS ); sal_Int32 nExtLen = aURL.GetExtension().getLength(); sNewName = sNewName.replaceAt( sNewName.getLength() - nExtLen - 1, nExtLen + 1, "" ); if (pPrefix) @@ -2692,7 +2691,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(const DBConnURITypes type, const // Cannot embed, as embedded data source would need the URL of the parent document. OUString sHomePath(SvtPathOptions().GetWorkPath()); utl::TempFile aTempFile(sNewName, true, &sOutputExt, pDestDir ? pDestDir : &sHomePath); - aTempFile.EnableKillingFile(true); + aTempFile.EnableKillingFile(); OUString sTmpName = aTempFile.GetURL(); xStore->storeAsURL(sTmpName, uno::Sequence<beans::PropertyValue>()); } diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx index fbbdf3b..a234314 100644 --- a/sw/source/uibase/dbui/dbui.cxx +++ b/sw/source/uibase/dbui/dbui.cxx @@ -121,7 +121,7 @@ CancelableDialog::~CancelableDialog() void CancelableDialog::dispose() { - EndDialog( 0 ); + EndDialog(); m_pCancelButton.clear(); Dialog::dispose(); diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index b6b157d..f2c2c33 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -542,7 +542,7 @@ void SwSpellDialogChildWindow::GetFocus() case SHELL_MODE_TABLE_LIST_TEXT: { SwPaM* pCursor = pWrtShell->GetCrsr(); - if(m_pSpellState->m_pPointNode != &pCursor->GetNode(true) || + if(m_pSpellState->m_pPointNode != &pCursor->GetNode() || m_pSpellState->m_pMarkNode != &pCursor->GetNode(false)|| m_pSpellState->m_nPointPos != pCursor->GetPoint()->nContent.GetIndex()|| m_pSpellState->m_nMarkPos != pCursor->GetMark()->nContent.GetIndex()) @@ -599,7 +599,7 @@ void SwSpellDialogChildWindow::LoseFocus() { // store a node pointer and a pam-position to be able to check on next GetFocus(); SwPaM* pCursor = pWrtShell->GetCrsr(); - m_pSpellState->m_pPointNode = &pCursor->GetNode(true); + m_pSpellState->m_pPointNode = &pCursor->GetNode(); m_pSpellState->m_pMarkNode = &pCursor->GetNode(false); m_pSpellState->m_nPointPos = pCursor->GetPoint()->nContent.GetIndex(); m_pSpellState->m_nMarkPos = pCursor->GetMark()->nContent.GetIndex(); diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 9f44305..b7a293a 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -155,7 +155,7 @@ OUString SwGlossaryHdl::GetGroupName( size_t nId, OUString* pTitle ) OUString sRet = rStatGlossaries.GetGroupName(nId); if(pTitle) { - SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sRet, false); + SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sRet); if (pGroup && !pGroup->GetError()) { *pTitle = pGroup->GetName(); @@ -190,7 +190,7 @@ bool SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const OUSt FindGroupName(sOldGroup); if(rOld == rNew) { - SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sOldGroup, false); + SwTextBlocks* pGroup = rStatGlossaries.GetGroupDoc(sOldGroup); if(pGroup) { pGroup->SetName(rNewTitle); @@ -214,8 +214,8 @@ bool SwGlossaryHdl::RenameGroup(const OUString& rOld, OUString& rNew, const OUSt bool SwGlossaryHdl::CopyOrMove( const OUString& rSourceGroupName, OUString& rSourceShortName, const OUString& rDestGroupName, const OUString& rLongName, bool bMove ) { - SwTextBlocks* pSourceGroup = rStatGlossaries.GetGroupDoc(rSourceGroupName, false); - SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName, false); + SwTextBlocks* pSourceGroup = rStatGlossaries.GetGroupDoc(rSourceGroupName); + SwTextBlocks* pDestGroup = rStatGlossaries.GetGroupDoc(rDestGroupName); if (pDestGroup->IsReadOnly() || (bMove && pSourceGroup->IsReadOnly()) ) { delete pDestGroup; @@ -278,7 +278,7 @@ OUString SwGlossaryHdl::GetGlossaryShortName(const OUString &rName) { OUString sReturn; SwTextBlocks *pTmp = - pCurGrp ? pCurGrp: rStatGlossaries.GetGroupDoc( aCurGrp, false ); + pCurGrp ? pCurGrp: rStatGlossaries.GetGroupDoc( aCurGrp ); if(pTmp) { sal_uInt16 nIdx = pTmp->GetLongIndex( rName ); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 206579d..64a8b1a 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -743,7 +743,7 @@ bool SwTransferable::WriteObject( tools::SvRef<SotStorageStream>& xStream, SwDoc* pDoc = static_cast<SwDoc*>(pObject); xWrt->bWriteClipboardDoc = true; xWrt->bWriteOnlyFirstTable = 0 != (TRNSFR_TABELLE & eBufferType); - xWrt->SetShowProgress( false ); + xWrt->SetShowProgress(); #if defined(DEBUGPASTE) SvFileStream aPasteDebug(OUString( @@ -3199,7 +3199,7 @@ void SwTransferable::DragFinished( sal_Int8 nAction ) { if ( !(pWrtShell->IsSelFrmMode() || pWrtShell->IsObjSelected()) ) //SmartCut, take one of the blanks along - pWrtShell->IntelligentCut( pWrtShell->GetSelectionType(), true ); + pWrtShell->IntelligentCut( pWrtShell->GetSelectionType() ); pWrtShell->DelRight(); } pWrtShell->EndUndo( UNDO_UI_DRAG_AND_MOVE ); diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index 2df32e5..3a207b0 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -84,9 +84,9 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt ) else { pButtonPopup->EnableItem(FN_DELETE_COMMENT, !mrSidebarWin.IsProtected() ); - pButtonPopup->EnableItem(FN_DELETE_NOTE_AUTHOR, true ); - pButtonPopup->EnableItem(FN_DELETE_ALL_NOTES, true ); - pButtonPopup->EnableItem(FN_FORMAT_ALL_NOTES, true ); + pButtonPopup->EnableItem(FN_DELETE_NOTE_AUTHOR); + pButtonPopup->EnableItem(FN_DELETE_ALL_NOTES); + pButtonPopup->EnableItem(FN_FORMAT_ALL_NOTES); } if (mrSidebarWin.IsProtected()) @@ -111,7 +111,7 @@ void AnnotationMenuButton::MouseButtonDown( const MouseEvent& rMEvt ) } else { - pButtonPopup->EnableItem(FN_REPLY, true); + pButtonPopup->EnableItem(FN_REPLY); } } diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index efe8876..f8a25e3 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -106,7 +106,7 @@ void SwAnnotationWin::SetPostItText() { Engine()->Clear(); GetOutlinerView()->SetAttribs(DefaultItem()); - GetOutlinerView()->InsertText(sNewText,false); + GetOutlinerView()->InsertText(sNewText); } Engine()->ClearModifyFlag(); @@ -243,15 +243,15 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* pText) + " (" + rLocalData.getDate( pWin->GetDate()) + ", " + rLocalData.getTime( pWin->GetTime(), false) + "): \""; - GetOutlinerView()->InsertText(aText,false); + GetOutlinerView()->InsertText(aText); // insert old, selected text or "..." // TODO: iterate over all paragraphs, not only first one to find out if it is empty if (!pText->GetTextObject().GetText(0).isEmpty()) GetOutlinerView()->GetEditView().InsertText(pText->GetTextObject()); else - GetOutlinerView()->InsertText(OUString("..."),false); - GetOutlinerView()->InsertText(OUString("\"\n"),false); + GetOutlinerView()->InsertText(OUString("...")); + GetOutlinerView()->InsertText(OUString("\"\n")); GetOutlinerView()->SetSelection(ESelection(0,0,EE_PARA_ALL,EE_TEXTPOS_ALL)); SfxItemSet aAnswerSet( DocView().GetDocShell()->GetPool() ); diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 5533fd6..af2b08a 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -452,17 +452,17 @@ void SwHeaderFooterWin::ExecuteCommand( sal_uInt16 nSlot ) const SfxPoolItem* pItem; if ( SfxItemState::SET == aSet.GetItemState( RES_BACKGROUND, false, &pItem ) ) { pHFFormat->SetFormatAttr( *pItem ); - rView.GetDocShell()->SetModified(true); + rView.GetDocShell()->SetModified(); } if ( SfxItemState::SET == aSet.GetItemState( RES_BOX, false, &pItem ) ) { pHFFormat->SetFormatAttr( *pItem ); - rView.GetDocShell()->SetModified(true); + rView.GetDocShell()->SetModified(); } if ( SfxItemState::SET == aSet.GetItemState( RES_SHADOW, false, &pItem ) ) { pHFFormat->SetFormatAttr( *pItem ); - rView.GetDocShell()->SetModified(true); + rView.GetDocShell()->SetModified(); } } } diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index 94f7356..114cf66 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -256,7 +256,7 @@ void SidebarTextControlAccessibleContext::ProcessWindowEvent( const VclWindowEve case VCLEVENT_WINDOW_GETFOCUS: case VCLEVENT_CONTROL_GETFOCUS: { - mpAccessibleTextHelper->SetFocus( true ); + mpAccessibleTextHelper->SetFocus(); } break; case VCLEVENT_WINDOW_LOSEFOCUS: diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 4157947..63bd1f1 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1185,7 +1185,7 @@ IMPL_LINK(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll) IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl) { - mrView.GetDocShell()->SetModified(true); + mrView.GetDocShell()->SetModified(); return 0; } @@ -1349,7 +1349,7 @@ void SwSidebarWin::SwitchToFieldPos() GotoPos(); sal_uInt32 aCount = MoveCaret(); if (aCount) - mrView.GetDocShell()->GetWrtShell()->SwCrsrShell::Right(aCount, 0, false); + mrView.GetDocShell()->GetWrtShell()->SwCrsrShell::Right(aCount, 0); GrabFocusToDocument(); } diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 1ca2bf9..e27c158 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -1293,7 +1293,7 @@ void SwEditWin::ChangeDrawing( sal_uInt8 nDir ) // switch snapping off if(!bWasNoSnap) - const_cast<SdrDragStat&>(rDragStat).SetNoSnap(true); + const_cast<SdrDragStat&>(rDragStat).SetNoSnap(); if(bWasSnapEnabled) pSdrView->SetSnapEnabled(false); @@ -1614,7 +1614,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt) else rSh.SttSelect(); rSh.MoveSection( fnSectionCurr, fnSectionEnd ); - rSh.Pop( true ); + rSh.Pop(); rSh.EndSelect(); sFormulaEntry = "="; } @@ -1984,7 +1984,7 @@ KEYINPUT_CHECKTABLE_INSDEL: } } if ( bCallNumOrNoNum - && rSh.NumOrNoNum( !bOnlyBackspaceKey, true ) ) + && rSh.NumOrNoNum( !bOnlyBackspaceKey ) ) { eKeyState = KS_NumOrNoNum; } @@ -2208,10 +2208,10 @@ KEYINPUT_CHECKTABLE_INSDEL: rSh.GetCurAttr(aSet); if(SfxItemState::SET == aSet.GetItemState(RES_TXTATR_INETFMT, false)) { - const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT, true); + const SfxPoolItem& rItem = aSet.Get(RES_TXTATR_INETFMT); bNormalChar = false; eKeyState = KS_End; - rSh.ClickToINetAttr(static_cast<const SwFormatINetFormat&>(rItem), URLLOAD_NOFILTER); + rSh.ClickToINetAttr(static_cast<const SwFormatINetFormat&>(rItem)); } } } @@ -2464,7 +2464,7 @@ KEYINPUT_CHECKTABLE_INSDEL: break; case KS_NumDown: - rSh.NumUpDown( true ); + rSh.NumUpDown(); m_nKS_NUMDOWN_Count = 2; break; case KS_NumUp: @@ -2496,7 +2496,7 @@ KEYINPUT_CHECKTABLE_INSDEL: break; case KS_OutlineDown: - rSh.OutlineUpDown( 1 ); + rSh.OutlineUpDown(); break; case KS_OutlineUp: rSh.OutlineUpDown( -1 ); @@ -3016,7 +3016,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) pHdl->GetKind() == HDL_ANCHOR_TR ) ) { // #i121463# Set selected during drag - pHdl->SetSelected(true); + pHdl->SetSelected(); m_pAnchorMarker = new SwAnchorMarker( pHdl ); UpdatePointer( aDocPos, rMEvt.GetModifier() ); return; @@ -4074,7 +4074,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt) { if ( m_pApplyTempl ) { - UpdatePointer(aDocPt, 0); // maybe a frame has to be marked here + UpdatePointer(aDocPt); // maybe a frame has to be marked here break; } // change ui if mouse is over SwPostItField @@ -4257,14 +4257,14 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) if (aTextBoxShapes.find(pFormat) == aTextBoxShapes.end()) { pSdrView->UnmarkAllObj(); - pSdrView->MarkObj(pObj,pPV,false,false); + pSdrView->MarkObj(pObj,pPV,false); } else { // If the fly frame is a textbox of a shape, then select the shape instead. SdrObject* pShape = aTextBoxShapes[pFormat]->FindSdrObject(); pSdrView->UnmarkAllObj(); - pSdrView->MarkObj(pShape, pPV, false, false); + pSdrView->MarkObj(pShape, pPV, false); } } } @@ -5435,7 +5435,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt ) rSh.GetCrsr()->GetPoint()->nContent = nPosIdx; rSh.GetCrsr()->GetMark()->nNode = nPosNodeIdx; rSh.GetCrsr()->GetMark()->nContent = - rSh.GetCrsr()->GetContentNode( true )->Len(); + rSh.GetCrsr()->GetContentNode()->Len(); } else if( nPosNodeIdx == nMarkNodeIdx ) { @@ -5590,7 +5590,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) rSh.Edit(); } - UpdatePointer( aDocPos, 0 ); + UpdatePointer( aDocPos ); if( !rSh.IsSelFrmMode() && !GetView().GetViewFrame()->GetDispatcher()->IsLocked() ) @@ -5628,7 +5628,7 @@ bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits