diff options
author | Noel Grandin <noel@peralex.com> | 2016-09-09 08:37:09 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-09-09 08:49:59 +0000 |
commit | c3c3e5b0554ca3f49649c96cf0b0b1b770713532 (patch) | |
tree | ca72b4772363484cc3664c26b70698fc396c8e8b /svtools | |
parent | d4b0ab2214425545aac5d98c49dc320ee39d6dc2 (diff) |
loplugin:constantparam in svtools
Change-Id: I04caae0c9ae621c55e16d3bdc014a4729617feb3
Reviewed-on: https://gerrit.libreoffice.org/28757
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/contnr/imivctl.hxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 10 | ||||
-rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 4 | ||||
-rw-r--r-- | svtools/source/control/fmtfield.cxx | 8 | ||||
-rw-r--r-- | svtools/source/control/scriptedtext.cxx | 16 | ||||
-rw-r--r-- | svtools/source/control/scrwin.cxx | 5 | ||||
-rw-r--r-- | svtools/source/dialogs/roadmapwizard.cxx | 8 | ||||
-rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 16 | ||||
-rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 13 | ||||
-rw-r--r-- | svtools/source/java/javacontext.cxx | 2 | ||||
-rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 4 |
11 files changed, 37 insertions, 51 deletions
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index a46b6795670b..b83ef89724c4 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -291,7 +291,7 @@ class SvxIconChoiceCtrl_Impl bool bSelect, bool bSyncPaint ); - void RepaintEntries( SvxIconViewFlags nEntryFlagsMask ); + void RepaintSelectedEntries(); void SetListPositions(); void SetDefaultTextSize(); bool IsAutoArrange() const diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 4c6b9151dc93..2cd7332e4c0c 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -236,7 +236,7 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle ) if( (nWinStyle & WB_DETAILS)) { if (!m_pColumns) - SetColumn( 0, SvxIconChoiceCtrlColumnInfo( 100 )); + SetColumn( 0, SvxIconChoiceCtrlColumnInfo() ); } } @@ -685,7 +685,7 @@ void SvxIconChoiceCtrl_Impl::Paint(vcl::RenderContext& rRenderContext, const Rec rRenderContext.Pop(); } -void SvxIconChoiceCtrl_Impl::RepaintEntries(SvxIconViewFlags nEntryFlagsMask) +void SvxIconChoiceCtrl_Impl::RepaintSelectedEntries() { const size_t nCount = pZOrderList->size(); if (!nCount) @@ -695,7 +695,7 @@ void SvxIconChoiceCtrl_Impl::RepaintEntries(SvxIconViewFlags nEntryFlagsMask) for (size_t nCur = 0; nCur < nCount; nCur++) { SvxIconChoiceCtrlEntry* pEntry = (*pZOrderList)[nCur]; - if (pEntry->GetFlags() & nEntryFlagsMask) + if (pEntry->GetFlags() & SvxIconViewFlags::SELECTED) { const Rectangle& rBoundRect = GetEntryBoundRect(pEntry); if (aOutRect.IsOver(rBoundRect)) @@ -1463,7 +1463,7 @@ void SvxIconChoiceCtrl_Impl::CheckScrollBars() void SvxIconChoiceCtrl_Impl::GetFocus() { - RepaintEntries( SvxIconViewFlags::SELECTED ); + RepaintSelectedEntries(); if( pCursor ) { pCursor->SetFlags( SvxIconViewFlags::FOCUSED ); @@ -1481,7 +1481,7 @@ void SvxIconChoiceCtrl_Impl::LoseFocus() // HideFocus (); // pView->Invalidate ( aFocus.aRect ); - RepaintEntries( SvxIconViewFlags::SELECTED ); + RepaintSelectedEntries(); } void SvxIconChoiceCtrl_Impl::SetUpdateMode( bool bUpdate ) diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 373b19159e6d..946975ff2df6 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3319,11 +3319,11 @@ SvLBoxItem* SvTreeListBox::GetItem(SvTreeListEntry* pEntry,long nX ) return GetItem_Impl( pEntry, nX, &pDummyTab ); } -void SvTreeListBox::AddTab(long nTabPos, SvLBoxTabFlags nFlags, void* pUserData ) +void SvTreeListBox::AddTab(long nTabPos, SvLBoxTabFlags nFlags ) { nFocusWidth = -1; SvLBoxTab* pTab = new SvLBoxTab( nTabPos, nFlags ); - pTab->SetUserData( pUserData ); + pTab->SetUserData( nullptr ); aTabs.push_back( pTab ); if( nTreeFlags & SvTreeFlags::USESEL ) { diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index deb22cda6b9b..910ed3df4a75 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -296,7 +296,7 @@ FormattedField::StaticFormatter::~StaticFormatter() } -FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle, SvNumberFormatter* pInitialFormatter) +FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle) :SpinField(pParent, nStyle) ,m_aLastSelection(0,0) ,m_dMinValue(0) @@ -319,12 +319,6 @@ FormattedField::FormattedField(vcl::Window* pParent, WinBits nStyle, SvNumberFor ,m_pLastOutputColor(nullptr) ,m_bUseInputStringForFormatting(false) { - - if (pInitialFormatter) - { - m_pFormatter = pInitialFormatter; - m_nFormatKey = 0; - } } VCL_BUILDER_FACTORY_ARGS(FormattedField, WB_BORDER | WB_SPIN) diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 1f0bfc153e5c..c6a709d4c3dd 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -65,10 +65,7 @@ private: public: /** This constructor sets an output device and fonts for all script types. */ SvtScriptedTextHelper_Impl( - OutputDevice& _rOutDevice, - vcl::Font* _pLatinFont, - vcl::Font* _pAsianFont, - vcl::Font* _pCmplxFont ); + OutputDevice& _rOutDevice ); /** Copy constructor. */ SvtScriptedTextHelper_Impl( const SvtScriptedTextHelper_Impl& _rCopy ); @@ -91,12 +88,11 @@ public: SvtScriptedTextHelper_Impl::SvtScriptedTextHelper_Impl( - OutputDevice& _rOutDevice, - vcl::Font* _pLatinFont, vcl::Font* _pAsianFont, vcl::Font* _pCmplxFont ) : + OutputDevice& _rOutDevice ) : mrOutDevice( _rOutDevice ), - maLatinFont( _pLatinFont ? *_pLatinFont : _rOutDevice.GetFont() ), - maAsianFont( _pAsianFont ? *_pAsianFont : _rOutDevice.GetFont() ), - maCmplxFont( _pCmplxFont ? *_pCmplxFont : _rOutDevice.GetFont() ), + maLatinFont( _rOutDevice.GetFont() ), + maAsianFont( _rOutDevice.GetFont() ), + maCmplxFont( _rOutDevice.GetFont() ), maDefltFont( _rOutDevice.GetFont() ) { } @@ -301,7 +297,7 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos ) SvtScriptedTextHelper::SvtScriptedTextHelper( OutputDevice& _rOutDevice ) : - mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice, nullptr, nullptr, nullptr ) ) + mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice ) ) { } diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 061bfb0a070f..6691a238b9f9 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -38,14 +38,13 @@ void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags ) } -ScrollableWindow::ScrollableWindow( vcl::Window* pParent, - ScrollableWindowFlags nFlags ) : +ScrollableWindow::ScrollableWindow( vcl::Window* pParent ) : Window( pParent, WB_CLIPCHILDREN ), aVScroll( VclPtr<ScrollBar>::Create(this, WinBits(WB_VSCROLL | WB_DRAG)) ), aHScroll( VclPtr<ScrollBar>::Create(this, WinBits(WB_HSCROLL | WB_DRAG)) ), aCornerWin( VclPtr<ScrollBarBox>::Create(this) ) { - ImpInitialize( nFlags ); + ImpInitialize( ScrollableWindowFlags::DEFAULT ); } diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 24cba255f631..377bb27527ac 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -109,15 +109,15 @@ namespace svt } //= RoadmapWizard - RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, const WinBits i_nStyle, WizardButtonFlags _nButtonFlags ) - :OWizardMachine( _pParent, i_nStyle, _nButtonFlags ) + RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, const WinBits i_nStyle ) + :OWizardMachine( _pParent, i_nStyle, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) ,m_pImpl( new RoadmapWizardImpl ) { impl_construct(); } - RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, WizardButtonFlags _nButtonFlags ) - :OWizardMachine( _pParent, _nButtonFlags ) + RoadmapWizard::RoadmapWizard( vcl::Window* _pParent ) + :OWizardMachine( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) ,m_pImpl( new RoadmapWizardImpl ) { impl_construct(); diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 42b2799f1d5e..7552caf077e6 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -71,23 +71,23 @@ void GraphicObject::ImplAfterDataChange() mpMgr->ImplCheckSizeOfSwappedInGraphics(this); } -GraphicObject::GraphicObject( const GraphicManager* pMgr ) : +GraphicObject::GraphicObject() : maLink (), maUserData () { ImplConstruct(); ImplAssignGraphicData(); - ImplSetGraphicManager( pMgr ); + ImplSetGraphicManager( nullptr ); } -GraphicObject::GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr ) : +GraphicObject::GraphicObject( const Graphic& rGraphic ) : maGraphic ( rGraphic ), maLink (), maUserData () { ImplConstruct(); ImplAssignGraphicData(); - ImplSetGraphicManager( pMgr ); + ImplSetGraphicManager( nullptr ); } GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicManager* pMgr ) : @@ -104,7 +104,7 @@ GraphicObject::GraphicObject( const GraphicObject& rGraphicObj, const GraphicMan SetSwapState(); } -GraphicObject::GraphicObject( const OString& rUniqueID, const GraphicManager* pMgr ) : +GraphicObject::GraphicObject( const OString& rUniqueID ) : maLink (), maUserData () { @@ -113,7 +113,7 @@ GraphicObject::GraphicObject( const OString& rUniqueID, const GraphicManager* pM // assign default properties ImplAssignGraphicData(); - ImplSetGraphicManager( pMgr, &rUniqueID ); + ImplSetGraphicManager( nullptr, &rUniqueID ); // update properties ImplAssignGraphicData(); @@ -588,7 +588,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, } void GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, - const Size& rOffset, const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags, int nTileCacheSize1D ) + const Size& rOffset, GraphicManagerDrawFlags nFlags, int nTileCacheSize1D ) { if( pOut == nullptr || rSize.Width() == 0 || rSize.Height() == 0 ) return; @@ -606,7 +606,7 @@ void GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const while (((sal_Int64)rSize.Height() * nTileCacheSize1D) > SAL_MAX_UINT16) nTileCacheSize1D /= 2; - ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, pAttr, nFlags, nTileCacheSize1D ); + ImplDrawTiled( pOut, rArea, aOutTileSize, rOffset, nullptr, nFlags, nTileCacheSize1D ); } bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 645588499b09..67ead4c755e4 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -1658,13 +1658,13 @@ struct ImplTileInfo }; -bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, +bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nNumTilesX, int nNumTilesY, const Size& rTileSizePixel, const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags ) { - if( nExponent <= 1 ) - return false; + // how many tiles to generate per recursion step + const int nExponent = 2; // determine MSB factor int nMSBFactor( 1 ); @@ -1878,9 +1878,6 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel, const Size& rOffset, const GraphicAttr* pAttr, GraphicManagerDrawFlags nFlags, int nTileCacheSize1D ) { - // how many tiles to generate per recursion step - enum{ SubdivisionExponent=2 }; - const MapMode aOutMapMode( pOut->GetMapMode() ); const MapMode aMapMode( aOutMapMode.GetMapUnit(), Point(), aOutMapMode.GetScaleX(), aOutMapMode.GetScaleY() ); bool bRet( false ); @@ -1903,7 +1900,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c aVDev->SetMapMode( aMapMode ); // draw bitmap content - if( ImplRenderTempTile( *aVDev.get(), SubdivisionExponent, nNumTilesInCacheX, + if( ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX, nNumTilesInCacheY, rSizePixel, pAttr, nFlags ) ) { BitmapEx aTileBitmap( aVDev->GetBitmap( Point(0,0), aVDev->GetOutputSize() ) ); @@ -1918,7 +1915,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c else aAlphaGraphic.SetGraphic( GetGraphic().GetBitmapEx().GetMask() ); - if( aAlphaGraphic.ImplRenderTempTile( *aVDev.get(), SubdivisionExponent, nNumTilesInCacheX, + if( aAlphaGraphic.ImplRenderTempTile( *aVDev.get(), nNumTilesInCacheX, nNumTilesInCacheY, rSizePixel, pAttr, nFlags ) ) { // Combine bitmap and alpha/mask diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index b03398755a2e..82b76e34acac 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -68,7 +68,7 @@ Any SAL_CALL JavaContext::getValueByName( const OUString& Name) throw (RuntimeEx { osl::MutexGuard aGuard(osl::Mutex::getGlobalMutex()); if (!m_xHandler.is()) - m_xHandler.set( new JavaInteractionHandler(true/*bShowErrorsOnce*/)); + m_xHandler.set( new JavaInteractionHandler ); } retVal = makeAny(m_xHandler); diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index b1f8e452b0a6..f947a288eac3 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -45,9 +45,9 @@ using namespace com::sun::star::task; namespace svt { -JavaInteractionHandler::JavaInteractionHandler(bool bReportErrorOnce) : +JavaInteractionHandler::JavaInteractionHandler() : m_aRefCount(0), - m_bShowErrorsOnce(bReportErrorOnce), + m_bShowErrorsOnce(true), m_bJavaDisabled_Handled(false), m_bInvalidSettings_Handled(false), m_bJavaNotFound_Handled(false), |