diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-01 15:06:14 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-04 09:09:54 +0000 |
commit | b62e6b011a3c9a340353546b73ff2eda0e793215 (patch) | |
tree | 8281c01f5639fd78fbcc45d7414e08657e1c6941 /svx | |
parent | 953f8f2cfecbe3005eb7de84daf1c9d86379244c (diff) |
loplugin:constantparam in svx
Change-Id: Ib3c1262d5488e3e348ae985f53ff8c63f2175555
Reviewed-on: https://gerrit.libreoffice.org/23724
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/ctredlin.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 8 | ||||
-rw-r--r-- | svx/source/fmcomp/dbaexchange.cxx | 3 | ||||
-rw-r--r-- | svx/source/fmcomp/gridctrl.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/fmtools.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svddrgmt.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 12 | ||||
-rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdview.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 4 |
10 files changed, 25 insertions, 26 deletions
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index fba5c46dd6a4..a74418260c86 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -997,9 +997,9 @@ void SvxTPFilter::DeactivatePage() TabPage::DeactivatePage(); } -void SvxTPFilter::Enable( bool bEnable, bool bChild) +void SvxTPFilter::Enable( bool bEnable) { - TabPage::Enable(bEnable,bChild); + TabPage::Enable(bEnable); if(m_pCbDate->IsEnabled()) { RowEnableHdl(m_pCbDate); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 90f2ef54f356..69dbc1ed95e7 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -68,13 +68,13 @@ Bitmap& SvxRectCtl::GetRectBitmap() } SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RECT_POINT eRpt, - sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle) + sal_uInt16 nBorder, sal_uInt16 nCircle) : Control(pParent, WB_BORDER | WB_TABSTOP) , pAccContext(nullptr) , nBorderWidth(nBorder) , nRadius(nCircle) , eDefRP(eRpt) - , eCS(eStyle) + , eCS(CS_RECT) , pBitmap(nullptr) , m_nState(CTL_STATE::NONE) , mbCompleteDisable(false) @@ -85,12 +85,12 @@ SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RECT_POINT eRpt, Resize_Impl(); } -void SvxRectCtl::SetControlSettings(RECT_POINT eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle) +void SvxRectCtl::SetControlSettings(RECT_POINT eRpt, sal_uInt16 nBorder, sal_uInt16 nCircle) { nBorderWidth = nBorder; nRadius = nCircle; eDefRP = eRpt; - eCS = eStyle; + eCS = CS_RECT; Resize_Impl(); } diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 88f888aaed25..bd7ba5a4ec05 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -45,13 +45,12 @@ namespace svx OColumnTransferable::OColumnTransferable(const OUString& _rDatasource ,const OUString& _rConnectionResource - ,const sal_Int32 _nCommandType ,const OUString& _rCommand ,const OUString& _rFieldName ,ColumnTransferFormatFlags _nFormats) :m_nFormatFlags(_nFormats) { - implConstruct(_rDatasource,_rConnectionResource,_nCommandType, _rCommand, _rFieldName); + implConstruct(_rDatasource,_rConnectionResource, css::sdb::CommandType::TABLE, _rCommand, _rFieldName); } diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 9d1768ca0687..8ec0779249b9 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -214,7 +214,7 @@ DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, co if (_rxObject.is()) { - m_pRealListener = new FmXDisposeMultiplexer(this, _rxObject, 0); + m_pRealListener = new FmXDisposeMultiplexer(this, _rxObject); m_pRealListener->acquire(); } } @@ -332,8 +332,8 @@ void DbGridControl::NavigationBar::PositionDataSource(sal_Int32 nRecord) m_bPositioning = false; } -DbGridControl::NavigationBar::NavigationBar(vcl::Window* pParent, WinBits nStyle) - :Control(pParent, nStyle) +DbGridControl::NavigationBar::NavigationBar(vcl::Window* pParent) + :Control(pParent, 0) ,m_aRecordText(VclPtr<FixedText>::Create(this, WB_VCENTER)) ,m_aAbsolute(VclPtr<DbGridControl::NavigationBar::AbsolutePos>::Create(this, WB_CENTER | WB_VCENTER)) ,m_aRecordOf(VclPtr<FixedText>::Create(this, WB_VCENTER)) diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index b1a5a75e921c..897b3c7ecb0b 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -299,10 +299,10 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter) } -FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< css::lang::XComponent>& _rxObject, sal_Int16 _nId) +FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< css::lang::XComponent>& _rxObject) :m_xObject(_rxObject) ,m_pListener(_pListener) - ,m_nId(_nId) + ,m_nId(0) { m_pListener->setAdapter(this); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 56fa3eadcf3e..0ce6a144a2ee 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -560,7 +560,7 @@ void SdrDragMethod::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr } else if (IsDraggingGluePoints()) { nOpt=ImpTakeDescriptionOptions::GLUEPOINTS; } - getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,0,nOpt); + getSdrDragView().ImpTakeDescriptionStr(nStrCacheID,rStr,nOpt); } SdrObject* SdrDragMethod::GetDragObj() const diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 06988245b3cb..b50f5e3dee1b 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -105,7 +105,7 @@ struct SdrModelImpl void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbeddedHelper, - bool bUseExtColorTable, bool bLoadRefCounts) + bool bUseExtColorTable) { mpImpl = new SdrModelImpl; mpImpl->mpUndoManager=nullptr; @@ -188,9 +188,9 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe if ( pPool == nullptr ) { - pItemPool=new SdrItemPool(nullptr, bLoadRefCounts); + pItemPool=new SdrItemPool(nullptr, false/*bLoadRefCounts*/); // Outliner doesn't have its own Pool, so use the EditEngine's - SfxItemPool* pOutlPool=EditEngine::CreatePool( bLoadRefCounts ); + SfxItemPool* pOutlPool=EditEngine::CreatePool( false/*bLoadRefCounts*/ ); // OutlinerPool as SecondaryPool of SdrPool pItemPool->SetSecondaryPool(pOutlPool); // remember that I created both pools myself @@ -236,14 +236,14 @@ SdrModel::SdrModel(): maMaPag(), maPages() { - ImpCtor(nullptr, nullptr, false, false); + ImpCtor(nullptr, nullptr, false); } SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable): maMaPag(), maPages() { - ImpCtor(pPool,pPers,bUseExtColorTable, false/*bLoadRefCounts*/); + ImpCtor(pPool,pPers,bUseExtColorTable); } SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable): @@ -251,7 +251,7 @@ SdrModel::SdrModel(const OUString& rPath, SfxItemPool* pPool, ::comphelper::IEmb maPages(), aTablePath(rPath) { - ImpCtor(pPool,pPers,bUseExtColorTable, false/*bLoadRefCounts*/); + ImpCtor(pPool,pPers,bUseExtColorTable); } SdrModel::~SdrModel() diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 1fcd76375f4f..ac14c709521f 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -2010,7 +2010,7 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const } -void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 nVal, ImpTakeDescriptionOptions nOpt) const +void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, ImpTakeDescriptionOptions nOpt) const { rStr = ImpGetResStr(nStrCacheID); sal_Int32 nPos = rStr.indexOf("%1"); @@ -2031,7 +2031,7 @@ void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, } } - rStr = rStr.replaceFirst("%2", OUString::number( nVal )); + rStr = rStr.replaceFirst("%2", "0"); } diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 24c633939c9b..064b2d01ecd9 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1271,11 +1271,11 @@ OUString SdrView::GetStatusText() ImpTakeDescriptionStr(STR_ViewMarked,aStr); if (IsGluePointEditMode()) { if (HasMarkedGluePoints()) { - ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,ImpTakeDescriptionOptions::GLUEPOINTS); + ImpTakeDescriptionStr(STR_ViewMarked,aStr,ImpTakeDescriptionOptions::GLUEPOINTS); } } else { if (HasMarkedPoints()) { - ImpTakeDescriptionStr(STR_ViewMarked,aStr,0,ImpTakeDescriptionOptions::POINTS); + ImpTakeDescriptionStr(STR_ViewMarked,aStr,ImpTakeDescriptionOptions::POINTS); } } } else { diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 12224cb05d6a..3fe70b52c92e 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -560,8 +560,8 @@ VclPtr<vcl::Window> SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent return VclPtr<vcl::Window>(); } -FillControl::FillControl(vcl::Window* pParent,WinBits nStyle) - : Window(pParent,nStyle | WB_DIALOGCONTROL) +FillControl::FillControl(vcl::Window* pParent) + : Window(pParent, WB_DIALOGCONTROL) , mpLbFillType(VclPtr<SvxFillTypeBox>::Create(this)) , mpToolBoxColor(VclPtr<sfx2::sidebar::SidebarToolBox>::Create(this)) , mpLbFillAttr(VclPtr<SvxFillAttrBox>::Create(this)) |