mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:flatten in canvas

Browse Source 
Change-Id: If14af63ab4f8fc7b9807319a2100f371ee103465
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92481
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-04-18 14:13:49 +02:00
parent cd0ab2cf50
commit 7fa4f64098
14 changed files with 674 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
canvas/source/cairo/cairo_canvasfont.cxx
View File

@@ -59,12 +59,14 @@ namespace cairocanvas
maFont->SetLanguage( LanguageTag::convertToLanguageType( rFontRequest.Locale, false));
// adjust to stretched/shrunk font
if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
{
if( ::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) )
return;
VclPtr<OutputDevice> pOutDev( mpRefDevice->getOutputDevice() );
if( pOutDev )
{
if( !pOutDev )
return;
const bool bOldMapState( pOutDev->IsMapModeEnabled() );
pOutDev->EnableMapMode(false);
@@ -82,8 +84,6 @@ namespace cairocanvas
pOutDev->EnableMapMode(bOldMapState);
}
}
}
void SAL_CALL CanvasFont::disposing()
{

18
canvas/source/cairo/cairo_canvashelper.cxx
View File

@@ -216,8 +216,9 @@ namespace cairocanvas
{
SAL_INFO( "canvas.cairo", "clear whole area: " << maSize.getX() << " x " << maSize.getY() );
if( mpCairo )
{
if( !mpCairo )
return;
cairo_save( mpCairo.get() );
cairo_identity_matrix( mpCairo.get() );
@@ -235,7 +236,6 @@ namespace cairocanvas
cairo_restore( mpCairo.get() );
}
}
void CanvasHelper::drawLine( const rendering::XCanvas* /*pCanvas*/,
const geometry::RealPoint2D& aStartPoint,
@@ -243,8 +243,9 @@ namespace cairocanvas
const rendering::ViewState& viewState,
const rendering::RenderState& renderState )
{
if( mpCairo )
{
if( !mpCairo )
return;
cairo_save( mpCairo.get() );
cairo_set_line_width( mpCairo.get(), 1 );
@@ -257,7 +258,6 @@ namespace cairocanvas
cairo_restore( mpCairo.get() );
}
}
void CanvasHelper::drawBezier( const rendering::XCanvas* ,
const geometry::RealBezierSegment2D& aBezierSegment,
@@ -265,8 +265,9 @@ namespace cairocanvas
const rendering::ViewState& viewState,
const rendering::RenderState& renderState )
{
if( mpCairo )
{
if( !mpCairo )
return;
cairo_save( mpCairo.get() );
cairo_set_line_width( mpCairo.get(), 1 );
@@ -284,7 +285,6 @@ namespace cairocanvas
cairo_restore( mpCairo.get() );
}
}
#define PARAMETRICPOLYPOLYGON_IMPLEMENTATION_NAME "Canvas::ParametricPolyPolygon"

6
canvas/source/cairo/cairo_devicehelper.cxx
View File

@@ -232,8 +232,9 @@ namespace cairocanvas
{
static sal_Int32 nFilePostfixCount(0);
if( mpRefDevice )
{
if( !mpRefDevice )
return;
OUString aFilename = "dbg_frontbuffer" + OUString::number(nFilePostfixCount) + ".bmp";
SvFileStream aStream( aFilename, StreamMode::STD_READWRITE );
@@ -247,7 +248,6 @@ namespace cairocanvas
++nFilePostfixCount;
}
}
SurfaceSharedPtr DeviceHelper::createSurface( const ::basegfx::B2ISize& rSize, int aContent )
{

12
canvas/source/cairo/cairo_spritehelper.cxx
View File

@@ -83,11 +83,13 @@ namespace cairocanvas
const double fAlpha( getAlpha() );
const ::basegfx::B2DHomMatrix aTransform( getTransformation() );
if( isActive() && !::basegfx::fTools::equalZero( fAlpha ) )
{
if( !(isActive() && !::basegfx::fTools::equalZero( fAlpha )) )
return;
SAL_INFO( "canvas.cairo", "CanvasCustomSprite::redraw called");
if( pCairo )
{
if( !pCairo )
return;
basegfx::B2DVector aSize = getSizePixel();
cairo_save( pCairo.get() );
@@ -149,8 +151,6 @@ namespace cairocanvas
cairo_paint_with_alpha( pCairo.get(), fAlpha );
cairo_restore( pCairo.get() );
}
}
#ifdef CAIRO_CANVAS_PERF_TRACE
mxDevice->stopPerfTrace( &aTimer, "sprite redraw" );

6
canvas/source/opengl/ogl_canvashelper.cxx
View File

@@ -400,8 +400,9 @@ namespace oglcanvas
const rendering::ViewState& viewState,
const rendering::RenderState& renderState )
{
if( mpDevice )
{
if( !mpDevice )
return;
mpRecordedActions->push_back( Action() );
Action& rAct=mpRecordedActions->back();
@@ -415,7 +416,6 @@ namespace oglcanvas
aBezierSegment.Py),
aEndPoint);
}
}
uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* /*pCanvas*/,
const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,

30
canvas/source/tools/canvascustomspritehelper.cxx
View File

@@ -194,8 +194,9 @@ namespace canvas
{
// check whether bitmap is non-alpha, and whether its
// transformed size covers the whole sprite.
if( !xBitmap->hasAlpha() )
{
if( xBitmap->hasAlpha() )
return;
const geometry::IntegerSize2D& rInputSize(
xBitmap->getSize() );
const ::basegfx::B2DSize& rOurSize(
@@ -218,7 +219,6 @@ namespace canvas
mbIsContentFullyOpaque = true;
}
}
}
void CanvasCustomSpriteHelper::setAlpha( const Sprite::Reference& rSprite,
double alpha )
@@ -257,8 +257,9 @@ namespace canvas
::basegfx::unotools::b2DPointFromRealPoint2D(aNewPos) );
aPoint *= aTransform;
if( aPoint != maPosition )
{
if( aPoint == maPosition )
return;
const ::basegfx::B2DRectangle& rBounds
= getUpdateArea( ::basegfx::B2DRectangle( 0.0, 0.0,
maSize.getX(),
@@ -274,7 +275,6 @@ namespace canvas
maPosition = aPoint;
}
}
void CanvasCustomSpriteHelper::transform( const Sprite::Reference& rSprite,
const geometry::AffineMatrix2D& aTransformation )
@@ -283,8 +283,9 @@ namespace canvas
::basegfx::unotools::homMatrixFromAffineMatrix(aMatrix,
aTransformation);
if( maTransform != aMatrix )
{
if( maTransform == aMatrix )
return;
// retrieve bounds before and after transformation change.
const ::basegfx::B2DRectangle& rPrevBounds( getUpdateArea() );
@@ -303,7 +304,6 @@ namespace canvas
mbTransformDirty = true;
}
}
void CanvasCustomSpriteHelper::clip( const Sprite::Reference& rSprite,
const uno::Reference< rendering::XPolyPolygon2D >& xClip )
@@ -351,8 +351,9 @@ namespace canvas
if( !mpSpriteCanvas.get() )
return; // we're disposed
if( !mbActive )
{
if( mbActive )
return;
mpSpriteCanvas->showSprite( rSprite );
mbActive = true;
@@ -366,15 +367,15 @@ namespace canvas
getUpdateArea() );
}
}
}
void CanvasCustomSpriteHelper::hide( const Sprite::Reference& rSprite )
{
if( !mpSpriteCanvas.get() )
return; // we're disposed
if( mbActive )
{
if( !mbActive )
return;
mpSpriteCanvas->hideSprite( rSprite );
mbActive = false;
@@ -388,7 +389,6 @@ namespace canvas
getUpdateArea() );
}
}
}
bool CanvasCustomSpriteHelper::isAreaUpdateOpaque( const ::basegfx::B2DRange& rUpdateArea ) const
{

6
canvas/source/tools/spriteredrawmanager.cxx
View File

@@ -56,8 +56,9 @@ namespace canvas
{
// only deal with change events from the currently
// affected sprite
if( rSpriteRecord.mpAffectedSprite == mpAffectedSprite )
{
if( rSpriteRecord.mpAffectedSprite != mpAffectedSprite )
return;
switch( rSpriteRecord.meChangeType )
{
case SpriteRedrawManager::SpriteChangeRecord::ChangeType::move:
@@ -92,7 +93,6 @@ namespace canvas
break;
}
}
}
void commit( SpriteRedrawManager::SpriteConnectedRanges& rUpdateCollector ) const
{

38
canvas/source/tools/verifyinput.cxx
View File

@@ -295,9 +295,10 @@ namespace canvas::tools
#endif
}
if( renderState.CompositeOperation < rendering::CompositeOperation::CLEAR ||
renderState.CompositeOperation > rendering::CompositeOperation::SATURATE )
{
if( !(renderState.CompositeOperation < rendering::CompositeOperation::CLEAR ||
renderState.CompositeOperation > rendering::CompositeOperation::SATURATE) )
return;
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
@@ -309,7 +310,6 @@ namespace canvas::tools
throw lang::IllegalArgumentException();
#endif
}
}
void verifyInput( const rendering::Texture& texture,
const char* pStr,
@@ -361,9 +361,10 @@ namespace canvas::tools
#endif
}
if( texture.RepeatModeY < rendering::TexturingMode::NONE ||
texture.RepeatModeY > rendering::TexturingMode::REPEAT )
{
if( !(texture.RepeatModeY < rendering::TexturingMode::NONE ||
texture.RepeatModeY > rendering::TexturingMode::REPEAT) )
return;
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
@@ -375,7 +376,6 @@ namespace canvas::tools
throw lang::IllegalArgumentException();
#endif
}
}
namespace
{
@@ -483,9 +483,10 @@ namespace canvas::tools
#endif
}
if( strokeAttributes.JoinType < rendering::PathJoinType::NONE ||
strokeAttributes.JoinType > rendering::PathJoinType::BEVEL )
{
if( !(strokeAttributes.JoinType < rendering::PathJoinType::NONE ||
strokeAttributes.JoinType > rendering::PathJoinType::BEVEL) )
return;
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
@@ -497,7 +498,6 @@ namespace canvas::tools
throw lang::IllegalArgumentException();
#endif
}
}
void verifyInput( const rendering::IntegerBitmapLayout& bitmapLayout,
const char* pStr,
@@ -552,9 +552,10 @@ namespace canvas::tools
#endif
}
if( bitmapLayout.ColorSpace->getEndianness() < util::Endianness::LITTLE ||
bitmapLayout.ColorSpace->getEndianness() > util::Endianness::BIG )
{
if( !(bitmapLayout.ColorSpace->getEndianness() < util::Endianness::LITTLE ||
bitmapLayout.ColorSpace->getEndianness() > util::Endianness::BIG) )
return;
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
@@ -566,7 +567,6 @@ namespace canvas::tools
throw lang::IllegalArgumentException();
#endif
}
}
void verifyInput( const rendering::FontRequest& fontRequest,
const char* pStr,
@@ -660,8 +660,9 @@ namespace canvas::tools
#endif
}
if( size.Height <= 0 )
{
if( size.Height > 0 )
return;
#if OSL_DEBUG_LEVEL > 0
throw lang::IllegalArgumentException(
OUString::createFromAscii(pStr) +
@@ -673,7 +674,6 @@ namespace canvas::tools
throw lang::IllegalArgumentException();
#endif
}
}
void verifySpriteSize( const geometry::RealSize2D& size,
const char* pStr,

6
canvas/source/vcl/backbuffer.cxx
View File

@@ -31,8 +31,9 @@ namespace vclcanvas
maVDev( VclPtr<VirtualDevice>::Create( rRefDevice,
bMonochromeBuffer ? DeviceFormat::BITMASK : DeviceFormat::DEFAULT ) )
{
if( !bMonochromeBuffer )
{
if( bMonochromeBuffer )
return;
// #i95645#
#if defined( MACOSX )
// use AA on VCLCanvas for Mac
@@ -44,7 +45,6 @@ namespace vclcanvas
maVDev->SetAntialiasing( maVDev->GetAntialiasing() & ~AntialiasingFlags::EnableB2dDraw);
#endif
}
}
BackBuffer::~BackBuffer()
{

6
canvas/source/vcl/bitmapbackbuffer.cxx
View File

@@ -106,8 +106,9 @@ namespace vclcanvas
void BitmapBackBuffer::createVDev() const
{
if( !mpVDev )
{
if( mpVDev )
return;
// VDev not yet created, do it now. Create an alpha-VDev,
// if bitmap has transparency.
mpVDev = maBitmap->IsTransparent() ?
@@ -130,7 +131,6 @@ namespace vclcanvas
mpVDev->SetAntialiasing(mpVDev->GetAntialiasing() & ~AntialiasingFlags::EnableB2dDraw);
#endif
}
}
void BitmapBackBuffer::updateVDev() const
{

24
canvas/source/vcl/canvashelper.cxx
View File

@@ -154,8 +154,9 @@ namespace vclcanvas
void CanvasHelper::clear()
{
// are we disposed?
if( mpOutDevProvider )
{
if( !mpOutDevProvider )
return;
OutputDevice& rOutDev( mpOutDevProvider->getOutDev() );
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
@@ -167,8 +168,9 @@ namespace vclcanvas
rOutDev.DrawRect( ::tools::Rectangle( Point(),
rOutDev.GetOutputSizePixel()) );
if( mp2ndOutDevProvider )
{
if( !mp2ndOutDevProvider )
return;
OutputDevice& rOutDev2( mp2ndOutDevProvider->getOutDev() );
rOutDev2.SetDrawMode( DrawModeFlags::Default );
@@ -182,8 +184,6 @@ namespace vclcanvas
rOutDev2.SetDrawMode( DrawModeFlags::BlackLine | DrawModeFlags::BlackFill | DrawModeFlags::BlackText |
DrawModeFlags::BlackGradient | DrawModeFlags::BlackBitmap );
}
}
}
void CanvasHelper::drawLine( const rendering::XCanvas* ,
const geometry::RealPoint2D& aStartRealPoint2D,
@@ -192,8 +192,9 @@ namespace vclcanvas
const rendering::RenderState& renderState )
{
// are we disposed?
if( mpOutDevProvider )
{
if( !mpOutDevProvider )
return;
// nope, render
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
setupOutDevState( viewState, renderState, LINE_COLOR );
@@ -208,7 +209,6 @@ namespace vclcanvas
if( mp2ndOutDevProvider )
mp2ndOutDevProvider->getOutDev().DrawLine( aStartPoint, aEndPoint );
}
}
void CanvasHelper::drawBezier( const rendering::XCanvas* ,
const geometry::RealBezierSegment2D& aBezierSegment,
@@ -216,8 +216,9 @@ namespace vclcanvas
const rendering::ViewState& viewState,
const rendering::RenderState& renderState )
{
if( mpOutDevProvider )
{
if( !mpOutDevProvider )
return;
tools::OutDevStateKeeper aStateKeeper( mpProtectedOutDevProvider );
setupOutDevState( viewState, renderState, LINE_COLOR );
@@ -248,7 +249,6 @@ namespace vclcanvas
if( mp2ndOutDevProvider )
mp2ndOutDevProvider->getOutDev().DrawPolygon( aPoly );
}
}
uno::Reference< rendering::XCachedPrimitive > CanvasHelper::drawPolyPolygon( const rendering::XCanvas* ,
const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon,

6
canvas/source/vcl/devicehelper.cxx
View File

@@ -196,8 +196,9 @@ namespace vclcanvas
{
static sal_Int32 nFilePostfixCount(0);
if( mpOutDev )
{
if( !mpOutDev )
return;
OUString aFilename = "dbg_frontbuffer" + OUString::number(nFilePostfixCount) + ".bmp";
SvFileStream aStream( aFilename, StreamMode::STD_READWRITE );
@@ -211,7 +212,6 @@ namespace vclcanvas
++nFilePostfixCount;
}
}
}

14
canvas/source/vcl/spritecanvashelper.cxx
View File

@@ -597,8 +597,9 @@ namespace vclcanvas
void SpriteCanvasHelper::renderSpriteCount( OutputDevice& rOutDev )
{
if( mpRedrawManager )
{
if( !mpRedrawManager )
return;
sal_Int32 nCount(0);
mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
@@ -614,15 +615,15 @@ namespace vclcanvas
text,
Point(0, 30) );
}
}
void SpriteCanvasHelper::renderMemUsage( OutputDevice& rOutDev )
{
BackBufferSharedPtr pBackBuffer( mpOwningSpriteCanvas->getBackBuffer() );
if( mpRedrawManager &&
pBackBuffer )
{
if( !(mpRedrawManager &&
pBackBuffer) )
return;
double nPixel(0.0);
// accumulate pixel count for each sprite into fCount
@@ -656,6 +657,5 @@ namespace vclcanvas
Point(0, 60) );
}
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

20
canvas/source/vcl/spritehelper.cxx
View File

@@ -98,9 +98,10 @@ namespace vclcanvas
const double fAlpha( getAlpha() );
if( isActive() &&
!::basegfx::fTools::equalZero( fAlpha ) )
{
if( !(isActive() &&
!::basegfx::fTools::equalZero( fAlpha )) )
return;
const Point aEmptyPoint;
const ::basegfx::B2DVector& rOrigOutputSize( getSizePixel() );
@@ -241,8 +242,9 @@ namespace vclcanvas
// transformBitmap() might return empty bitmaps, for tiny
// scales.
if( !!(*maContent) )
{
if( !(*maContent) )
return;
rTargetSurface.Push( PushFlags::CLIPREGION );
// apply clip (if any)
@@ -303,8 +305,9 @@ namespace vclcanvas
rTargetSurface.Pop();
if( mbShowSpriteBounds )
{
if( !mbShowSpriteBounds )
return;
::tools::PolyPolygon aMarkerPoly(
::canvas::tools::getBoundMarksPolyPolygon(
::basegfx::B2DRectangle(aOutPos.X(),
@@ -338,9 +341,6 @@ namespace vclcanvas
SAL_INFO( "canvas.vcl",
"sprite " << this << " has prio " << getPriority());
}
}
}
}
::basegfx::B2DPolyPolygon SpriteHelper::polyPolygonFromXPolyPolygon2D( uno::Reference< rendering::XPolyPolygon2D >& xPoly ) const
{