From a003d8c59d0324ab3f44ec608f473e654ce48902 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 19 Oct 2015 17:51:39 +0200 Subject: loplugin:defaultparams Change-Id: I4e344e780baae6c9828d0d708dfb0a9390af533a --- svx/source/customshapes/EnhancedCustomShape2d.cxx | 4 ++-- svx/source/dialog/_contdlg.cxx | 6 +++--- svx/source/dialog/docrecovery.cxx | 4 ++-- svx/source/dialog/imapdlg.cxx | 4 ++-- svx/source/dialog/srchdlg.cxx | 4 ++-- svx/source/engine3d/view3d.cxx | 4 ++-- svx/source/fmcomp/gridcell.cxx | 6 +++--- svx/source/fmcomp/gridctrl.cxx | 18 +++++++++--------- svx/source/form/fmshimp.cxx | 6 +++--- svx/source/form/fmvwimp.cxx | 2 +- svx/source/form/navigatortreemodel.cxx | 8 ++++---- svx/source/gallery2/GalleryControl.cxx | 6 +++--- svx/source/gallery2/galbrws1.cxx | 4 ++-- svx/source/gallery2/galctrl.cxx | 2 +- svx/source/sdr/properties/defaultproperties.cxx | 2 +- svx/source/sdr/properties/e3dsceneproperties.cxx | 2 +- svx/source/sidebar/nbdtmg.cxx | 4 ++-- svx/source/svdraw/svddrgmt.cxx | 4 ++-- svx/source/svdraw/svdedtv1.cxx | 2 +- svx/source/svdraw/svdedxv.cxx | 2 +- svx/source/svdraw/svdmrkv.cxx | 2 +- svx/source/svdraw/svdotext.cxx | 2 +- svx/source/svdraw/svdoutl.cxx | 2 +- svx/source/svdraw/svdpntv.cxx | 2 +- svx/source/svdraw/svdtext.cxx | 2 +- svx/source/svdraw/svdundo.cxx | 16 ++++++++-------- svx/source/svdraw/svdview.cxx | 2 +- svx/source/unodraw/unoshtxt.cxx | 2 +- 28 files changed, 62 insertions(+), 62 deletions(-) (limited to 'svx') diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 80acbd49db09..a5c4d3cfdc10 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1129,7 +1129,7 @@ bool EnhancedCustomShape2d::GetHandlePosition( const sal_uInt32 nIndex, Point& r { if ( aHandle.nFlags & HandleFlags::POLAR ) { - Point aReferencePoint( GetPoint( aHandle.aPolar, true ) ); + Point aReferencePoint( GetPoint( aHandle.aPolar ) ); double fAngle; double fRadius; @@ -1158,7 +1158,7 @@ bool EnhancedCustomShape2d::GetHandlePosition( const sal_uInt32 nIndex, Point& r aHandle.aPosition.Second = aFirst; } } - rReturnPosition = GetPoint( aHandle.aPosition, true ); + rReturnPosition = GetPoint( aHandle.aPosition ); } const GeoStat aGeoStat( static_cast(pCustomShapeObj)->GetGeoStat() ); if ( aGeoStat.nShearAngle ) diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index b29f0c868175..047fff7735bb 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -277,9 +277,9 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow * SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); m_pStbStatus->InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE ); - m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( OUString(" 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN ); - m_pStbStatus->InsertItem( 3, 10 + GetTextWidth( OUString(" 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN ); - m_pStbStatus->InsertItem( 4, 20, SIB_CENTER | SIB_IN ); + m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( OUString(" 9999,99 cm / 9999,99 cm ") ) ); + m_pStbStatus->InsertItem( 3, 10 + GetTextWidth( OUString(" 9999,99 cm x 9999,99 cm ") ) ); + m_pStbStatus->InsertItem( 4, 20 ); Resize(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 559f1385c890..00c0af858c10 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -897,7 +897,7 @@ RecoveryDialog::RecoveryDialog(vcl::Window* pParent, RecoveryCore* pCore) m_pFileListLB->SetBackground( rStyleSettings.GetDialogColor() ); - m_pNextBtn->Enable(true); + m_pNextBtn->Enable(); m_pNextBtn->SetClickHdl( LINK( this, RecoveryDialog, NextButtonHdl ) ); m_pCancelBtn->SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) ); @@ -973,7 +973,7 @@ short RecoveryDialog::execute() // let the user decide the next step. m_pDescrFT->SetText(m_aRecoveryOnlyFinishDescr); m_pNextBtn->SetText(m_aRecoveryOnlyFinish); - m_pNextBtn->Enable(true); + m_pNextBtn->Enable(); m_pCancelBtn->Enable(false); return 0; } diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index b689285554f4..e0ba29e1fe7c 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -192,8 +192,8 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); m_pStbStatus->InsertItem( 1, 130, SIB_LEFT | SIB_IN | SIB_AUTOSIZE ); - m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( OUString(" 9999,99 cm / 9999,99 cm ") ), SIB_CENTER | SIB_IN ); - m_pStbStatus->InsertItem( 3, 10 + GetTextWidth( OUString(" 9999,99 cm x 9999,99 cm ") ), SIB_CENTER | SIB_IN ); + m_pStbStatus->InsertItem( 2, 10 + GetTextWidth( OUString(" 9999,99 cm / 9999,99 cm ") ) ); + m_pStbStatus->InsertItem( 3, 10 + GetTextWidth( OUString(" 9999,99 cm x 9999,99 cm ") ) ); m_pFtURL->Disable(); m_pURLBox->Disable(); diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index d378eaf18ccc..49533b2cf6f3 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1315,7 +1315,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) } nModifyFlag = 0; const SfxPoolItem* ppArgs[] = { pSearchItem, 0 }; - rBindings.ExecuteSynchron( FID_SEARCH_NOW, ppArgs, 0L ); + rBindings.ExecuteSynchron( FID_SEARCH_NOW, ppArgs ); } else if ( pBtn == m_pCloseBtn ) { @@ -1720,7 +1720,7 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl ) if ( m_pSearchAllBtn == pCtrl && ( SearchOptionFlags::SEARCHALL & nOptions ) ) { - m_pSearchAllBtn->Enable( true ); + m_pSearchAllBtn->Enable(); return; } if ( m_pReplaceBtn == pCtrl && ( SearchOptionFlags::REPLACE & nOptions ) ) diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 8efce1078997..eb5d1a60dea5 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -674,7 +674,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj) // add undo now if( GetModel()->IsUndoEnabled() ) - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj, false)); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj)); } pObj->SetMergedItem(SvxColorItem(RGB_Color(COL_GRAY), EE_CHAR_COLOR)); @@ -697,7 +697,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj) && eFillStyle != drawing::FillStyle_NONE) { if(pObj->GetPage() && GetModel()->IsUndoEnabled() ) - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj, false)); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj)); pObj->SetMergedItem(XLineStyleItem(drawing::LineStyle_NONE)); pObj->SetMergedItem(XLineWidthItem(0L)); } diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 5c85ac7f1a87..ac24e425d6e2 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1328,7 +1328,7 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x Reference< XRowSet > xCursorForm(xCursor, UNO_QUERY); if (xCursorForm.is()) { // wenn wir vom Cursor den Formatter nehmen, dann auch den Key vom Feld, an das wir gebunden sind - m_xSupplier = getNumberFormats(getConnection(xCursorForm), false); + m_xSupplier = getNumberFormats(getConnection(xCursorForm)); if (m_rColumn.GetField().is()) nFormatKey = ::comphelper::getINT32(m_rColumn.GetField()->getPropertyValue(FM_PROP_FORMATKEY)); @@ -2087,7 +2087,7 @@ double DbCurrencyField::GetCurrency(const Reference< ::com::sun::star::sdb::XCol { // OSL_TRACE("double = %.64f ",fValue); fValue = ::rtl::math::pow10Exp(fValue, m_nScale); - fValue = ::rtl::math::round(fValue, 0); + fValue = ::rtl::math::round(fValue); } return fValue; } @@ -2142,7 +2142,7 @@ void DbCurrencyField::updateFromModel( Reference< XPropertySet > _rxModel ) if ( m_nScale ) { dValue = ::rtl::math::pow10Exp( dValue, m_nScale ); - dValue = ::rtl::math::round(dValue, 0); + dValue = ::rtl::math::round(dValue); } static_cast< LongCurrencyField* >( m_pWindow.get() )->SetValue( dValue ); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index d7c43f20297e..f2f99b1138fe 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1297,14 +1297,14 @@ sal_uInt16 DbGridControl::SetOptions(sal_uInt16 nOpt) if (m_nOptions & OPT_INSERT) { // the insert option is to be set m_xEmptyRow = new DbGridRow(); - RowInserted(GetRowCount(), 1, true); + RowInserted(GetRowCount()); } else { // the insert option is to be reset m_xEmptyRow = NULL; if ((GetCurRow() == GetRowCount() - 1) && (GetCurRow() > 0)) GoToRowColumnId(GetCurRow() - 1, GetCurColumnId()); - RowRemoved(GetRowCount(), 1); + RowRemoved(GetRowCount()); } } @@ -1952,7 +1952,7 @@ void DbGridControl::AdjustRows() m_aBar->InvalidateAll(m_nCurrentPos, true); } else // too few - RowInserted(GetRowCount(), -nDelta, true); + RowInserted(GetRowCount(), -nDelta); } if (m_bRecordCountFinal && m_nTotalCount < 0) @@ -2614,7 +2614,7 @@ void DbGridControl::SetFilterMode(bool bMode) } // one row for filtering - RowInserted(0, 1, true); + RowInserted(0); SetUpdateMode(true); } else @@ -2717,7 +2717,7 @@ void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) th // -> we've to add a new grid row if ((nRecordCount == GetRowCount() - 1) && m_xCurrentRow->IsNew()) { - RowInserted(GetRowCount(), 1, true); + RowInserted(GetRowCount()); InvalidateStatusCell(m_nCurrentPos); m_aBar->InvalidateAll(m_nCurrentPos); } @@ -2729,7 +2729,7 @@ void DbGridControl::DataSourcePropertyChanged(const PropertyChangeEvent& evt) th // one is about to be cleaned, too, the second one is obsolete now. if (m_xCurrentRow->IsNew() && nRecordCount == (GetRowCount() - 2)) { - RowRemoved(GetRowCount() - 1, 1); + RowRemoved(GetRowCount() - 1); InvalidateStatusCell(m_nCurrentPos); m_aBar->InvalidateAll(m_nCurrentPos); } @@ -2937,7 +2937,7 @@ void DbGridControl::CellModified() if (m_nCurrentPos == GetRowCount() - 1) { // increment RowCount - RowInserted(GetRowCount(), 1, true); + RowInserted(GetRowCount()); InvalidateStatusCell(m_nCurrentPos); m_aBar->InvalidateAll(m_nCurrentPos); } @@ -3021,7 +3021,7 @@ void DbGridControl::Undo() if (m_nCurrentPos == GetRowCount() - 2) { // maybe we already removed it (in resetCurrentRow, called if the above moveToInsertRow // caused our data source form to be reset - which should be the usual case ....) - RowRemoved(GetRowCount() - 1, 1); + RowRemoved(GetRowCount() - 1); m_aBar->InvalidateAll(m_nCurrentPos); } @@ -3048,7 +3048,7 @@ void DbGridControl::resetCurrentRow() { if (m_nCurrentPos == GetRowCount() - 2) { - RowRemoved(GetRowCount() - 1, 1); + RowRemoved(GetRowCount() - 1); m_aBar->InvalidateAll(m_nCurrentPos); } } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 38191932f29a..cf5d5a3231ea 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1606,7 +1606,7 @@ bool FmXFormShell::GetY2KState(sal_uInt16& n) Reference< XRowSet> xDB(xForm, UNO_QUERY); DBG_ASSERT(xDB.is(), "FmXFormShell::GetY2KState : current form has no dbform-interface !"); - Reference< XNumberFormatsSupplier> xSupplier( getNumberFormats(getConnection(xDB), false)); + Reference< XNumberFormatsSupplier> xSupplier( getNumberFormats(getConnection(xDB))); if (xSupplier.is()) { Reference< XPropertySet> xSet(xSupplier->getNumberFormatSettings()); @@ -1637,7 +1637,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) Reference< XRowSet > xActiveRowSet( xActiveForm, UNO_QUERY ); if ( xActiveRowSet.is() ) { - Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getConnection( xActiveRowSet ), false ) ); + Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getConnection( xActiveRowSet ) ) ); if (xSupplier.is()) { Reference< XPropertySet> xSet(xSupplier->getNumberFormatSettings()); @@ -1677,7 +1677,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) Reference< XRowSet> xElementAsRowSet( xCurrentElement, UNO_QUERY ); if ( xElementAsRowSet.is() ) { - Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getConnection( xElementAsRowSet ), false ) ); + Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( getConnection( xElementAsRowSet ) ) ); if (!xSupplier.is()) continue; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 9c8c096ff6c6..7ca908280742 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1250,7 +1250,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const svx::ODataAccessDescriptor if ( !xField.is() ) return NULL; - Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( xConnection, false ), UNO_SET_THROW ); + Reference< XNumberFormatsSupplier > xSupplier( getNumberFormats( xConnection ), UNO_SET_THROW ); Reference< XNumberFormats > xNumberFormats( xSupplier->getNumberFormats(), UNO_SET_THROW ); OUString sLabelPostfix; diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 15f95ec4ece6..e6e8b3f72bed 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -525,7 +525,7 @@ namespace svxform xForms->getByIndex(i) >>= xSubForm; FmFormData* pSubFormData = new FmFormData( xSubForm, m_aNormalImages, pFormData ); - Insert( pSubFormData, CONTAINER_APPEND ); + Insert( pSubFormData ); // new branch, if SubForm contains Subforms itself @@ -554,7 +554,7 @@ namespace svxform if (xSubForm.is()) { // actual component is a form pSubFormData = new FmFormData(xSubForm, m_aNormalImages, pFormData); - Insert(pSubFormData, CONTAINER_APPEND); + Insert(pSubFormData); // new branch, if SubForm contains Subforms itself @@ -563,7 +563,7 @@ namespace svxform else { pNewControlData = new FmControlData(xCurrentComponent, m_aNormalImages, pFormData); - Insert(pNewControlData, CONTAINER_APPEND); + Insert(pNewControlData); } } } @@ -602,7 +602,7 @@ namespace svxform if( !pParentData ) { pParentData = new FmFormData( xForm, m_aNormalImages, NULL ); - Insert( pParentData, CONTAINER_APPEND ); + Insert( pParentData ); } if (!FindData(xComp, pParentData->GetChildList(),false)) diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index b06cd4d259e9..65a8629f1616 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -56,13 +56,13 @@ GalleryControl::GalleryControl ( mbIsInitialResize(true) { mpBrowser1->SelectTheme(0); - mpBrowser1->Show(true); + mpBrowser1->Show(); - mpBrowser2->Show(true); + mpBrowser2->Show(); mpSplitter->SetHorizontal(false); mpSplitter->SetSplitHdl( LINK( this, GalleryControl, SplitHdl ) ); - mpSplitter->Show( true ); + mpSplitter->Show(); InitSettings(); } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index f83c6f32bb43..f8153ff6c762 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -140,8 +140,8 @@ GalleryBrowser1::GalleryBrowser1( ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) ); ImplAdjustControls(); - maNewTheme->Show( true ); - mpThemes->Show( true ); + maNewTheme->Show(); + mpThemes->Show(); } GalleryBrowser1::~GalleryBrowser1() diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index bf6e1c12a9ee..69da8fe66806 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -74,7 +74,7 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL ) { GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); GalleryProgress aProgress( &rFilter ); - if( rFilter.ImportGraphic( aGraphic, _aURL, GRFILTER_FORMAT_DONTKNOW ) ) + if( rFilter.ImportGraphic( aGraphic, _aURL ) ) bRet = false; } diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 66f099bd7f73..813e963ea034 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -53,7 +53,7 @@ namespace sdr { if(rProps.mpItemSet) { - mpItemSet = rProps.mpItemSet->Clone(true); + mpItemSet = rProps.mpItemSet->Clone(); // do not keep parent info, this may be changed by later construrtors. // This class just copies the ItemSet, ignore parent. diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 3494219726ca..f9a128d4a5fe 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -121,7 +121,7 @@ namespace sdr { // Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items. // #i50808# Leak fix, Clone produces a new instance and we get ownership here - std::unique_ptr pNewSet(rSet.Clone(true)); + std::unique_ptr pNewSet(rSet.Clone()); DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)"); for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++) diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index a79655ff034b..d340655c1d5b 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -1385,7 +1385,7 @@ bool NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_ SvxNumRule aTmpRule1(aNum); SvxNumRule aTmpRule2(aNum); ApplyNumRule(aTmpRule1,nIndex,mLevel,true); - ApplyNumRule(aTmpRule2,nIndex,mLevel,false); + ApplyNumRule(aTmpRule2,nIndex,mLevel); if (aTmpRule1==aTmpRule2) _pSet->bIsCustomized=false; if (_pSet->bIsCustomized) { OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_NUMBERING_DESCRIPTION); @@ -1675,7 +1675,7 @@ bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI SvxNumRule aTmpRule1(aNum); SvxNumRule aTmpRule2(aNum); ApplyNumRule(aTmpRule1,nIndex,mLevel,true); - ApplyNumRule(aTmpRule2,nIndex,mLevel,false); + ApplyNumRule(aTmpRule2,nIndex,mLevel); if (aTmpRule1==aTmpRule2) pItemArr->bIsCustomized=false; if (pItemArr->bIsCustomized) { OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_MULTILEVEL_DESCRIPTION); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index f1af9617e50c..2040694f077b 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1068,7 +1068,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) if (getSdrDragView().IsMirrorAllowed(true,true)) { // limited - if (!getSdrDragView().IsMirrorAllowed(false)) nSA=4500; + if (!getSdrDragView().IsMirrorAllowed()) nSA=4500; if (!getSdrDragView().IsMirrorAllowed(true)) nSA=9000; } @@ -2581,7 +2581,7 @@ bool SdrDragMirror::BeginSdrDrag() bool b45=b90 || (std::abs(aDif.X()) == std::abs(aDif.Y())); nAngle=NormAngle360(GetAngle(aDif)); - if (!getSdrDragView().IsMirrorAllowed(false) && !b45) + if (!getSdrDragView().IsMirrorAllowed() && !b45) return false; // free choice of axis angle not allowed if (!getSdrDragView().IsMirrorAllowed() && !b90) diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index f933e23d072f..712dd85df9ec 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -769,7 +769,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, bool /*bRep } if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,true,&pPoolItem)==SfxItemState::SET) { long nAngle=static_cast(pPoolItem)->GetValue(); - ShearMarkedObj(aAllSnapRect.Center(),nAngle,false); + ShearMarkedObj(aAllSnapRect.Center(),nAngle); } if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,true,&pPoolItem)==SfxItemState::SET) { long nAngle=static_cast(pPoolItem)->GetValue(); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 6a2e179c71af..353261ae17c8 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1715,7 +1715,7 @@ bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) ImpTakeDescriptionStr(STR_EditSetAttributes,aStr); BegUndo(aStr); AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*mxTextEditObj.get())); - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*mxTextEditObj.get(),false)); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*mxTextEditObj.get())); EndUndo(); } diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 06494c643fc0..e4ca8d722ce8 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1453,7 +1453,7 @@ bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, bool bPrev) } } // nothing found, in this case, just select an object - if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),false); + if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol)); SdrObject* pTopObjHit=pTopMarkHit->GetMarkedSdrObj(); SdrObjList* pObjList=pTopObjHit->GetObjList(); diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index be3953cae14a..297313fc47b3 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1244,7 +1244,7 @@ void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const nOutlinerMode = OUTLINERMODE_TEXTOBJECT; rOutl.Init( nOutlinerMode ); - rOutl.SetGlobalCharStretching(100); + rOutl.SetGlobalCharStretching(); EEControlBits nStat=rOutl.GetControlWord(); nStat &= ~EEControlBits(EEControlBits::STRETCHING|EEControlBits::AUTOPAGESIZE); rOutl.SetControlWord(nStat); diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index a55926ca3e81..63f1ef49fe98 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -49,7 +49,7 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj ) nOutlinerMode2 = OUTLINERMODE_TEXTOBJECT; Init( nOutlinerMode2 ); - SetGlobalCharStretching(100); + SetGlobalCharStretching(); EEControlBits nStat = GetControlWord(); nStat &= ~EEControlBits( EEControlBits::STRETCHING | EEControlBits::AUTOPAGESIZE ); diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 2960680acbfb..9ca6864e92fe 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -1072,7 +1072,7 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRe SfxWhichIter aIter(pStyleSheet->GetItemSet()); sal_uInt16 nWhich=aIter.FirstWhich(); while (nWhich!=0) { - if (pStyleSheet->GetItemSet().GetItemState(nWhich,true)==SfxItemState::SET) { + if (pStyleSheet->GetItemSet().GetItemState(nWhich)==SfxItemState::SET) { maDefaultAttr.ClearItem(nWhich); } nWhich=aIter.NextWhich(); diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index b9d53d9db968..303d5f711628 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -127,7 +127,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) if( mpOutlinerParaObject && pOldModel!=NULL && pNewModel!=NULL) { - bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, true) == SfxItemState::SET; + bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT) == SfxItemState::SET; MapUnit aOldUnit(pOldModel->GetScaleUnit()); MapUnit aNewUnit(pNewModel->GetScaleUnit()); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 6b6e676748fe..5c8599385caa 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1515,14 +1515,14 @@ void SdrUndoDelPage::Redo() OUString SdrUndoDelPage::GetComment() const { OUString aStr; - ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0); + ImpTakeDescriptionStr(STR_UndoDelPage,aStr); return aStr; } OUString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const { OUString aStr; - ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0); + ImpTakeDescriptionStr(STR_UndoDelPage,aStr); return aStr; } @@ -1554,7 +1554,7 @@ void SdrUndoNewPage::Redo() OUString SdrUndoNewPage::GetComment() const { OUString aStr; - ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0); + ImpTakeDescriptionStr(STR_UndoNewPage,aStr); return aStr; } @@ -1563,14 +1563,14 @@ OUString SdrUndoNewPage::GetComment() const OUString SdrUndoCopyPage::GetComment() const { OUString aStr; - ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0); + ImpTakeDescriptionStr(STR_UndoCopPage,aStr); return aStr; } OUString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const { OUString aStr; - ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0); + ImpTakeDescriptionStr(STR_UndoCopPage,aStr); return aStr; } @@ -1599,7 +1599,7 @@ void SdrUndoSetPageNum::Redo() OUString SdrUndoSetPageNum::GetComment() const { OUString aStr; - ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0); + ImpTakeDescriptionStr(STR_UndoMovPage,aStr); return aStr; } @@ -1642,7 +1642,7 @@ void SdrUndoPageRemoveMasterPage::Redo() OUString SdrUndoPageRemoveMasterPage::GetComment() const { OUString aStr; - ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0); + ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr); return aStr; } @@ -1686,7 +1686,7 @@ void SdrUndoPageChangeMasterPage::Redo() OUString SdrUndoPageChangeMasterPage::GetComment() const { OUString aStr; - ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0); + ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr); return aStr; } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index def531e232ec..c276991d749c 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1115,7 +1115,7 @@ Pointer SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDevice* } bool bNo=false; if (!IsMirrorAllowed(true,true)) bNo=true; // any mirroring is forbidden - if (!IsMirrorAllowed(false) && !b45) bNo=true; // mirroring freely is forbidden + if (!IsMirrorAllowed() && !b45) bNo=true; // mirroring freely is forbidden if (!IsMirrorAllowed(true) && !b90) bNo=true; // mirroring horizontally/vertically is allowed if (bNo) return Pointer(PointerStyle::NotAllowed); if (b90) { diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 0d9757d59b88..7f141fa7918c 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -818,7 +818,7 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( bool bCreate // enter edit mode mpView->SdrEndTextEdit(); - if(mpView->SdrBeginTextEdit(mpObject, 0L, 0L, false, nullptr, 0L, false, false)) + if(mpView->SdrBeginTextEdit(mpObject, 0L, 0L, false, nullptr, 0L)) { SdrTextObj* pTextObj = dynamic_cast( mpObject ); if (pTextObj && pTextObj->IsTextEditActive()) -- cgit