diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:47:18 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:47:18 +0200 |
commit | 666f732412e739fda6d0578752156dbb11931a2f (patch) | |
tree | 3648da7df4cdc765741854f2d95d260d933c22c0 /vcl/source | |
parent | 6017a8ee741ca8b192dda2fe2f853392bbf26614 (diff) |
loplugin:defaultparams
Change-Id: I3e5ee77b51eb8e1207d3f95e6a1d9d8272532ba6
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/control/button.cxx | 4 | ||||
-rw-r--r-- | vcl/source/edit/texteng.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/bitmap3.cxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/evntpost.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/text.cxx | 6 | ||||
-rw-r--r-- | vcl/source/window/brdwin.cxx | 8 | ||||
-rw-r--r-- | vcl/source/window/introwin.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/menubarwindow.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/window.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/winproc.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/wrkwin.cxx | 4 |
14 files changed, 26 insertions, 28 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 78278c5001a2..5a259d07c779 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -2034,7 +2034,7 @@ void RadioButton::ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, } ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, 1, - nDrawFlags, nTextStyle, NULL ); + nDrawFlags, nTextStyle ); rMouseRect = Rectangle( aPos, aSize ); rMouseRect.Left() = rPos.X(); @@ -3109,7 +3109,7 @@ void CheckBox::ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, } ImplDrawAlignedImage( pDev, aPos, aSize, bLayout, 1, - nDrawFlags, nTextStyle, NULL ); + nDrawFlags, nTextStyle ); nLineY = aPos.Y() + aSize.Height()/2; rMouseRect = Rectangle( aPos, aSize ); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 316ee8de8ee1..c65b38d4f261 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -2589,7 +2589,7 @@ void TextEngine::RemoveAttribs( sal_uInt32 nPara, bool bIdleFormatAndUpdate ) if ( bIdleFormatAndUpdate ) IdleFormatAndUpdate( NULL, 0xFFFF ); else - FormatAndUpdate( NULL ); + FormatAndUpdate(); } } } @@ -2613,7 +2613,7 @@ void TextEngine::RemoveAttribs( sal_uInt32 nPara, sal_uInt16 nWhich, bool bIdleF if(bIdleFormatAndUpdate) IdleFormatAndUpdate( NULL, 0xFFFF ); else - FormatAndUpdate( NULL ); + FormatAndUpdate(); } } } @@ -2637,7 +2637,7 @@ void TextEngine::RemoveAttrib( sal_uInt32 nPara, const TextCharAttrib& rAttrib ) TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); pTEParaPortion->MarkSelectionInvalid( 0, pNode->GetText().getLength() ); mbFormatted = false; - FormatAndUpdate( NULL ); + FormatAndUpdate(); } } } @@ -2668,7 +2668,7 @@ void TextEngine::SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_Int32 if ( bIdleFormatAndUpdate ) IdleFormatAndUpdate( NULL, 0xFFFF ); else - FormatAndUpdate( NULL ); + FormatAndUpdate(); } } diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx index e0da9aa91241..85c64a11193f 100644 --- a/vcl/source/gdi/bitmap3.cxx +++ b/vcl/source/gdi/bitmap3.cxx @@ -270,9 +270,9 @@ bool Bitmap::Convert( BmpConversion eConversion ) case( BMP_CONVERSION_4BIT_COLORS ): { if( nBitCount < 4 ) - bRet = ImplConvertUp( 4, NULL ); + bRet = ImplConvertUp( 4 ); else if( nBitCount > 4 ) - bRet = ImplConvertDown( 4, NULL ); + bRet = ImplConvertDown( 4 ); else bRet = true; } @@ -318,7 +318,7 @@ bool Bitmap::Convert( BmpConversion eConversion ) case( BMP_CONVERSION_24BIT ): { if( nBitCount < 24 ) - bRet = ImplConvertUp( 24, NULL ); + bRet = ImplConvertUp( 24 ); else bRet = true; } diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index c29554948454..37032f9295bb 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -1567,7 +1567,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai Rectangle aRect; // hdu said base = index aMapVDev->GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(), - pAct->GetWidth(), NULL ); + pAct->GetWidth() ); Point aPt( pAct->GetPoint() ); aRect.Move( aPt.X(), aPt.Y() ); ImplActionBounds( aBound, OutputDevice::LogicToLogic( aRect, aMapVDev->GetMapMode(), GetPrefMapMode() ), aClipStack, 0 ); @@ -1582,7 +1582,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai OUString aStr( pStr ); Rectangle aRect; - aMapVDev->GetTextBoundRect( aRect, aStr, 0, 0, aStr.getLength(), 0, NULL ); + aMapVDev->GetTextBoundRect( aRect, aStr, 0, 0, aStr.getLength() ); Point aPt( pAct->GetStartPoint() ); aRect.Move( aPt.X(), aPt.Y() ); aRect.Right() = aRect.Left() + pAct->GetWidth(); diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 885bf7160acd..c90f41c7434c 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -467,7 +467,7 @@ PDFWriter::InitEncryption( const OUString& i_rOwnerPassword, void PDFWriter::PlayMetafile( const GDIMetaFile& i_rMTF, const vcl::PDFWriter::PlayMetafileContext& i_rPlayContext, PDFExtOutDevData* i_pData ) { - xImplementation->playMetafile( i_rMTF, i_pData, i_rPlayContext, NULL); + xImplementation->playMetafile( i_rMTF, i_pData, i_rPlayContext ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx index 1d4a657b772b..5331ecaad34e 100644 --- a/vcl/source/helper/evntpost.cxx +++ b/vcl/source/helper/evntpost.cxx @@ -43,7 +43,7 @@ void EventPoster::Post() { DBG_TESTSOLARMUTEX(); - m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ), nullptr ); + m_nId = Application::PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl ) ) ); } IMPL_LINK_TYPED( EventPoster, DoEvent_Impl, void*, /*p*/, void ) diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index d03f3cb106c8..dc1bcfcbacb1 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -914,7 +914,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, if ( !IsDeviceOutputNecessary() || pVector ) return; - SalLayout* pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, 0, NULL); + SalLayout* pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt); if( pSalLayout ) { ImplDrawText( *pSalLayout ); @@ -1184,7 +1184,7 @@ void OutputDevice::DrawStretchText( const Point& rStartPt, sal_uLong nWidth, if ( !IsDeviceOutputNecessary() ) return; - SalLayout* pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, nWidth, NULL); + SalLayout* pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, nWidth); if( pSalLayout ) { ImplDrawText( *pSalLayout ); @@ -1428,7 +1428,7 @@ std::shared_ptr<vcl::TextLayoutCache> OutputDevice::CreateTextLayoutCache( return nullptr; OUString copyBecausePrepareModifiesIt(rString); ImplLayoutArgs aLayoutArgs = ImplPrepareLayoutArgs(copyBecausePrepareModifiesIt, - 0, rString.getLength(), 0, nullptr, SalLayoutFlags::NONE, nullptr); + 0, rString.getLength(), 0, nullptr); SalLayout *const pSalLayout = mpGraphics->GetTextLayout( aLayoutArgs, 0 ); if (!pSalLayout) diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 9967e9c5d9f2..adb0621ab66b 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -56,7 +56,7 @@ static void ImplGetPinImage( DrawButtonFlags nStyle, bool bPinIn, Image& rImage Color aMaskColor( 0x00, 0x00, 0xFF ); pSVData->maCtrlData.mpPinImgList->InsertFromHorizontalBitmap ( ResId( SV_RESID_BITMAP_PIN, *pResMgr ), 4, - &aMaskColor, NULL, NULL ); + &aMaskColor ); } } @@ -1937,8 +1937,7 @@ void ImplBorderWindow::Resize() } mpMenuBarWindow->setPosSizePixel( nLeftBorder, nTopBorder, - aSize.Width()-nLeftBorder-nRightBorder, nMenuHeight, - PosSizeFlags::Pos | PosSizeFlags::Width | PosSizeFlags::Height); + aSize.Width()-nLeftBorder-nRightBorder, nMenuHeight); // shift the notebookbar down accordingly nTopBorder += nMenuHeight; @@ -1949,8 +1948,7 @@ void ImplBorderWindow::Resize() long nNotebookBarHeight = mpNotebookBarWindow->GetSizePixel().Height(); mpNotebookBarWindow->setPosSizePixel( nLeftBorder, nTopBorder, - aSize.Width() - nLeftBorder - nRightBorder, nNotebookBarHeight, - PosSizeFlags::Pos | PosSizeFlags::Width | PosSizeFlags::Height); + aSize.Width() - nLeftBorder - nRightBorder, nNotebookBarHeight); } GetBorder( pClientWindow->mpWindowImpl->mnLeftBorder, pClientWindow->mpWindowImpl->mnTopBorder, diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx index d8b400135477..b7bd49bba6a9 100644 --- a/vcl/source/window/introwin.cxx +++ b/vcl/source/window/introwin.cxx @@ -35,7 +35,7 @@ IntroWindow::IntroWindow( ) : WorkWindow( WINDOW_INTROWINDOW ) { ImplInitIntroWindowData(); - WorkWindow::ImplInit( 0, WB_INTROWIN, NULL ); + WorkWindow::ImplInit( 0, WB_INTROWIN ); } IntroWindow::~IntroWindow() diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index ae6c6b83ae53..67eba4eed45f 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -148,7 +148,7 @@ MenuBarWindow::MenuBarWindow( vcl::Window* pParent ) : aCloseBtn->SetPaintTransparent(true); aCloseBtn->SetParentClipMode(ParentClipMode::NoClip); - aCloseBtn->InsertItem(IID_DOCUMENTCLOSE, aCloseBtn->maImage, ToolBoxItemBits::NONE); + aCloseBtn->InsertItem(IID_DOCUMENTCLOSE, aCloseBtn->maImage); aCloseBtn->SetSelectHdl(LINK(this, MenuBarWindow, CloseHdl)); aCloseBtn->AddEventListener(LINK(this, MenuBarWindow, ToolboxEventHdl)); aCloseBtn->SetQuickHelpText(IID_DOCUMENTCLOSE, ResId(SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr).toString()); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 8b4308a9503a..cfcf37e8849b 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2972,7 +2972,7 @@ void ToolBox::ImplDrawButton(vcl::RenderContext& rRenderContext, const Rectangle } if (!bNativeOk) - vcl::RenderTools::DrawSelectionBackground(rRenderContext, *this, rRect, bIsWindow ? 3 : highlight, bChecked, true, bIsWindow, NULL, 2, NULL); + vcl::RenderTools::DrawSelectionBackground(rRenderContext, *this, rRect, bIsWindow ? 3 : highlight, bChecked, true, bIsWindow, NULL, 2); } void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, bool bLayout) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index e039c6d1396b..f770bda019a4 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2536,7 +2536,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags) // Since #104887#, the notifications for the access bridge are done in Impl(Set|Reset)ReallyVisible. Here, we // now only notify with a NULL data pointer, for all other clients except the access bridge. if ( !bRealVisibilityChanged ) - CallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE, NULL ); + CallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE ); if( aDogTag.IsDead() ) return; diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 1ee1661aac0f..ae7272735451 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1054,7 +1054,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, // ContextMenu if ( (nCode == KEY_CONTEXTMENU) || ((nCode == KEY_F10) && aKeyCode.IsShift() && !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) ) - bRet = !ImplCallCommand( pChild, CommandEventId::ContextMenu, NULL ); + bRet = !ImplCallCommand( pChild, CommandEventId::ContextMenu ); else if ( ( (nCode == KEY_F2) && aKeyCode.IsShift() ) || ( (nCode == KEY_F1) && aKeyCode.IsMod1() ) || // #101999# no active help when focus in toolbox, simulate BallonHelp instead ( (nCode == KEY_F1) && aKeyCode.IsShift() && bToolboxFocus ) ) diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx index 3977eee0fbd4..3881f15009d5 100644 --- a/vcl/source/window/wrkwin.cxx +++ b/vcl/source/window/wrkwin.cxx @@ -79,7 +79,7 @@ void WorkWindow::ImplInit( vcl::Window* pParent, WinBits nStyle, const ::com::su ImplInit( pParent, 0, pData ); } else - ImplInit( pParent, nStyle, NULL ); + ImplInit( pParent, nStyle ); } WorkWindow::WorkWindow( WindowType nType ) : @@ -92,7 +92,7 @@ WorkWindow::WorkWindow( vcl::Window* pParent, WinBits nStyle ) : SystemWindow( WINDOW_WORKWINDOW ) { ImplInitWorkWindowData(); - ImplInit( pParent, nStyle, NULL ); + ImplInit( pParent, nStyle ); } WorkWindow::WorkWindow( vcl::Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) : |