summaryrefslogtreecommitdiffstats
path: root/canvas/source/vcl
diff options
context:
space:
mode:
authorArkadiy Illarionov <qarkai@gmail.com>2019-05-04 23:42:17 +0300
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-06-11 20:24:40 +0200
commitc88f76035cd1d088cc06067270677618340fd839 (patch)
tree2e98a3c2c6bdb6ee909d0b7c45012060e57b9a29 /canvas/source/vcl
parentCppunitTest_sw_ww8import: disable failing assert on Windows (diff)
downloadcore-c88f76035cd1d088cc06067270677618340fd839.tar.gz
core-c88f76035cd1d088cc06067270677618340fd839.zip
Use hasElements to check Sequence emptiness in accessibility..canvas
Similar to clang-tidy readability-container-size-empty Change-Id: I24c3f04b4eed3c1cd973166885660f113a26844f Reviewed-on: https://gerrit.libreoffice.org/71805 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'canvas/source/vcl')
-rw-r--r--canvas/source/vcl/canvas.cxx2
-rw-r--r--canvas/source/vcl/canvashelper.cxx2
-rw-r--r--canvas/source/vcl/canvashelper_texturefill.cxx4
-rw-r--r--canvas/source/vcl/spritecanvas.cxx4
-rw-r--r--canvas/source/vcl/textlayout.cxx4
5 files changed, 8 insertions, 8 deletions
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 59c200c85b7e..c33185b2999c 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -74,7 +74,7 @@ namespace vclcanvas
void Canvas::initialize()
{
// #i64742# Only perform initialization when not in probe mode
- if( maArguments.getLength() == 0 )
+ if( !maArguments.hasElements() )
return;
/* maArguments:
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index a03ad7e1c6d3..47ea98d4b3c4 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -334,7 +334,7 @@ namespace vclcanvas
}
// apply dashing, if any
- if( strokeAttributes.DashArray.getLength() )
+ if( strokeAttributes.DashArray.hasElements() )
{
const std::vector<double>& aDashArray(
::comphelper::sequenceToContainer< std::vector<double> >(strokeAttributes.DashArray) );
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 50a0976cc56b..18d773e0df9e 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -571,7 +571,7 @@ namespace vclcanvas
{
ENSURE_ARG_OR_THROW( xPolyPolygon.is(),
"CanvasHelper::fillPolyPolygon(): polygon is NULL");
- ENSURE_ARG_OR_THROW( textures.getLength(),
+ ENSURE_ARG_OR_THROW( textures.hasElements(),
"CanvasHelper::fillTexturedPolyPolygon: empty texture sequence");
if( mpOutDevProvider )
@@ -591,7 +591,7 @@ namespace vclcanvas
::canvas::ParametricPolyPolygon* pGradient =
dynamic_cast< ::canvas::ParametricPolyPolygon* >( textures[0].Gradient.get() );
- if( pGradient && pGradient->getValues().maColors.getLength() )
+ if( pGradient && pGradient->getValues().maColors.hasElements() )
{
// copy state from Gradient polypoly locally
// (given object might change!)
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index ee1de2808c66..429559fbe964 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -54,7 +54,7 @@ namespace vclcanvas
SolarMutexGuard aGuard;
// #i64742# Only call initialize when not in probe mode
- if( maArguments.getLength() == 0 )
+ if( !maArguments.hasElements() )
return;
SAL_INFO("canvas.vcl", "SpriteCanvas created" );
@@ -71,7 +71,7 @@ namespace vclcanvas
SAL_INFO("canvas.vcl", "VCLSpriteCanvas::initialize called" );
- ENSURE_ARG_OR_THROW( maArguments.getLength() >= 1,
+ ENSURE_ARG_OR_THROW( maArguments.hasElements(),
"VCLSpriteCanvas::initialize: wrong number of arguments" );
/* maArguments:
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 0585a38c41f8..3eee412c3416 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -234,7 +234,7 @@ namespace vclcanvas
const sal_Int32 nAboveBaseline( -aMetric.GetAscent() );
const sal_Int32 nBelowBaseline( aMetric.GetDescent() );
- if( maLogicalAdvancements.getLength() )
+ if( maLogicalAdvancements.hasElements() )
{
return geometry::RealRectangle2D( 0, nAboveBaseline,
maLogicalAdvancements[ maLogicalAdvancements.getLength()-1 ],
@@ -330,7 +330,7 @@ namespace vclcanvas
setupLayoutMode( rOutDev, mnTextDirection );
- if( maLogicalAdvancements.getLength() )
+ if( maLogicalAdvancements.hasElements() )
{
// TODO(P2): cache that
std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]);