diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:45:21 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:45:21 +0200 |
commit | 6dd98f8b94a00e7aaf8695a6bf1c100dad149f96 (patch) | |
tree | ec5f2f507fad3585d06b636bb1408aa7952cfccb /editeng/source | |
parent | b8b83fca7d7959bb065f5e6442632a9541847ce4 (diff) |
loplugin:defaultparams
Change-Id: Id5e399309144b99757e172e69e8e6dbc5fbff365
Diffstat (limited to 'editeng/source')
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 6 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 22 | ||||
-rw-r--r-- | editeng/source/editeng/impedit4.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit5.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/textitem.cxx | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 30ea23ba3253..955cbc23b28f 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -384,7 +384,7 @@ void EditEngine::SetDefTab( sal_uInt16 nDefTab ) if ( pImpEditEngine->IsFormatted() ) { pImpEditEngine->FormatFullDoc(); - pImpEditEngine->UpdateViews( nullptr ); + pImpEditEngine->UpdateViews(); } } @@ -2064,7 +2064,7 @@ void EditEngine::QuickFormatDoc( bool bFull ) pImpEditEngine->FormatDoc(); // Don't pass active view, maybe selection is not updated yet... - pImpEditEngine->UpdateViews( NULL ); + pImpEditEngine->UpdateViews(); } void EditEngine::SetStyleSheet(const EditSelection& aSel, SfxStyleSheet* pStyle) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 7bae3735ee83..b974750cf760 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -204,7 +204,7 @@ void ImpEditEngine::SetRefDevice( OutputDevice* pRef ) if ( IsFormatted() ) { FormatFullDoc(); - UpdateViews( nullptr); + UpdateViews(); } } @@ -225,7 +225,7 @@ void ImpEditEngine::SetRefMapMode( const MapMode& rMapMode ) if ( IsFormatted() ) { FormatFullDoc(); - UpdateViews( nullptr); + UpdateViews(); } } @@ -3144,7 +3144,7 @@ sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, SeekCursor( pPortion->GetNode(), nPos+1, aTmpFont ); aTmpFont.SetPhysFont( GetRefDevice() ); ImplInitDigitMode(GetRefDevice(), aTmpFont.GetLanguage()); - nWidth += aTmpFont.QuickGetTextSize( GetRefDevice(), pPortion->GetNode()->GetString(), nPos, rTextPortion.GetLen(), NULL ).Width(); + nWidth += aTmpFont.QuickGetTextSize( GetRefDevice(), pPortion->GetNode()->GetString(), nPos, rTextPortion.GetLen() ).Width(); } } break; diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 7138dd8d3f04..a3b6ef6cdc3d 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -978,7 +978,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) // Height needed... SeekCursor( pNode, nTmpPos+1, aTmpFont ); - pPortion->GetSize().Height() = aTmpFont.QuickGetTextSize( GetRefDevice(), OUString(), 0, 0, NULL ).Height(); + pPortion->GetSize().Height() = aTmpFont.QuickGetTextSize( GetRefDevice(), OUString(), 0, 0 ).Height(); DBG_ASSERT( pPortion->GetSize().Width() >= 0, "Tab incorrectly calculated!" ); @@ -1024,7 +1024,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) OUString aFieldValue = cChar ? OUString(cChar) : static_cast<const EditCharAttribField*>(pNextFeature)->GetFieldValue(); if ( bCalcCharPositions || !pPortion->HasValidSize() ) { - pPortion->GetSize() = aTmpFont.QuickGetTextSize( GetRefDevice(), aFieldValue, 0, aFieldValue.getLength(), 0 ); + pPortion->GetSize() = aTmpFont.QuickGetTextSize( GetRefDevice(), aFieldValue, 0, aFieldValue.getLength() ); // So no scrolling for oversized fields if ( pPortion->GetSize().Width() > nXWidth ) { @@ -1160,7 +1160,7 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY ) if ( nDecPos != -1 ) { nW -= pParaPortion->GetTextPortions()[nTmpPortion].GetSize().Width(); - nW += aTmpFont.QuickGetTextSize( GetRefDevice(), pParaPortion->GetNode()->GetString(), nTmpPos, nDecPos, NULL ).Width(); + nW += aTmpFont.QuickGetTextSize( GetRefDevice(), pParaPortion->GetNode()->GetString(), nTmpPos, nDecPos ).Width(); aCurrentTab.bValid = false; } } @@ -2307,7 +2307,7 @@ sal_Int32 ImpEditEngine::SplitTextPortion( ParaPortion* pPortion, sal_Int32 nPos aTmpFont.SetPhysFont( GetRefDevice() ); GetRefDevice()->Push( PushFlags::TEXTLANGUAGE ); ImplInitDigitMode(GetRefDevice(), aTmpFont.GetLanguage()); - Size aSz = aTmpFont.QuickGetTextSize( GetRefDevice(), pPortion->GetNode()->GetString(), nTxtPortionStart, pTextPortion->GetLen(), NULL ); + Size aSz = aTmpFont.QuickGetTextSize( GetRefDevice(), pPortion->GetNode()->GetString(), nTxtPortionStart, pTextPortion->GetLen() ); GetRefDevice()->Pop(); pTextPortion->GetExtraInfos()->nOrgWidth = aSz.Width(); } @@ -3097,7 +3097,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt if ( 0x200B == cChar || 0x2060 == cChar ) { const OUString aBlank( ' ' ); - long nHalfBlankWidth = aTmpFont.QuickGetTextSize( pOutDev, aBlank, 0, 1, 0 ).Width() / 2; + long nHalfBlankWidth = aTmpFont.QuickGetTextSize( pOutDev, aBlank, 0, 1 ).Width() / 2; const long nAdvanceX = ( nTmpIdx == nTmpEnd ? rTextPortion.GetSize().Width() : @@ -3149,7 +3149,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aTmpFont.SetPropr( 25 ); aTmpFont.SetPhysFont( pOutDev ); - const Size aSlashSize = aTmpFont.QuickGetTextSize( pOutDev, aSlash, 0, 1, 0 ); + const Size aSlashSize = aTmpFont.QuickGetTextSize( pOutDev, aSlash, 0, 1 ); Point aSlashPos( aTmpPos ); const long nAddX = nHalfBlankWidth - aSlashSize.Width() / 2; if ( !IsVertical() ) @@ -3161,7 +3161,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aSlashPos.Y() = aTopLeftRectPos.Y() + nAddX; } - aTmpFont.QuickDrawText( pOutDev, aSlashPos, aSlash, 0, 1, 0 ); + aTmpFont.QuickDrawText( pOutDev, aSlashPos, aSlash, 0, 1 ); aTmpFont.SetEscapement( nOldEscapement ); aTmpFont.SetPropr( nOldPropr ); @@ -3551,7 +3551,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt aTmpFont.SetEscapement( 0 ); aTmpFont.SetPhysFont( pOutDev ); long nCharWidth = aTmpFont.QuickGetTextSize( pOutDev, - OUString(rTextPortion.GetExtraValue()), 0, 1, NULL ).Width(); + OUString(rTextPortion.GetExtraValue()), 0, 1 ).Width(); sal_Int32 nChars = 2; if( nCharWidth ) nChars = rTextPortion.GetSize().Width() / nCharWidth; @@ -3563,7 +3563,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt OUStringBuffer aBuf; comphelper::string::padToLength(aBuf, nChars, rTextPortion.GetExtraValue()); OUString aText(aBuf.makeStringAndClear()); - aTmpFont.QuickDrawText( pOutDev, aTmpPos, aText, 0, aText.getLength(), NULL ); + aTmpFont.QuickDrawText( pOutDev, aTmpPos, aText, 0, aText.getLength() ); pOutDev->DrawStretchText( aTmpPos, rTextPortion.GetSize().Width(), aText ); if ( bStripOnly ) @@ -3777,7 +3777,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev DBG_ASSERT( bVDevValid, "VDef could not be enlarged!" ); if ( !bVDevValid ) { - Paint( pView, rRect, 0); + Paint( pView, rRect ); return; } @@ -4213,7 +4213,7 @@ void ImpEditEngine::SetFlatMode( bool bFlat ) aEditDoc.CreateDefFont( !bFlat ); FormatFullDoc(); - UpdateViews( nullptr); + UpdateViews(); if ( pActiveView ) pActiveView->ShowCursor(); } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 5cda516a3b62..f5ae0db2cab3 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -190,7 +190,7 @@ EditPaM ImpEditEngine::ReadHTML( SvStream& rInput, const OUString& rBaseURL, Edi EditPaM ImpEditEngine::ReadBin( SvStream& rInput, EditSelection aSel ) { // Simply abuse a temporary text object ... - std::unique_ptr<EditTextObject> xObj(EditTextObject::Create( rInput, NULL )); + std::unique_ptr<EditTextObject> xObj(EditTextObject::Create( rInput )); EditPaM aLastPaM = aSel.Max(); if (xObj) @@ -2403,7 +2403,7 @@ void ImpEditEngine::DoOnlineSpelling( ContentNode* pThisNodeOnly, bool bSpellAtC if ( pActiveView && pActiveView->HasSelection() ) { // Then no output through VDev. - UpdateViews( NULL ); + UpdateViews(); } else if ( bSimpleRepaint ) { diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index b9773ef73f6e..0c47d9e1833c 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -60,7 +60,7 @@ void ImpEditEngine::SetStyleSheet( EditSelection aSel, SfxStyleSheet* pStyle ) for ( sal_Int32 n = nStartPara; n <= nEndPara; n++ ) SetStyleSheet( n, pStyle ); - SetUpdateMode( _bUpdate, 0 ); + SetUpdateMode( _bUpdate ); } void ImpEditEngine::SetStyleSheet( sal_Int32 nPara, SfxStyleSheet* pStyle ) diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index b00d7abe0692..709d26375588 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -3549,7 +3549,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo { vcl::Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType, aOutTypeArr[ n ].nLanguage, - GetDefaultFontFlags::OnlyOne, 0 ) ); + GetDefaultFontFlags::OnlyOne ) ); SvxFontItem* pItem = aItemArr[ n ]; pItem->SetFamily( aFont.GetFamily() ); pItem->SetFamilyName( aFont.GetName() ); |