diff options
Diffstat (limited to 'canvas/source/cairo')
| -rw-r--r-- | canvas/source/cairo/cairo_canvas.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 4 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_spritecanvas.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 134dabf26fc4..036d443aba7a 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -51,7 +51,7 @@ namespace cairocanvas void Canvas::initialize() { // #i64742# Only perform initialization when not in probe mode - if( maArguments.getLength() == 0 ) + if( !maArguments.hasElements() ) return; // tdf#93870 - force VCL canvas in OpenGL mode for now. diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 5a442dfc8997..71ca12e629ef 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -677,7 +677,7 @@ namespace cairocanvas rendering::FillRule eFillrule ) { if( pTextures ) - ENSURE_ARG_OR_THROW( pTextures->getLength(), + ENSURE_ARG_OR_THROW( pTextures->hasElements(), "CanvasHelper::fillTexturedPolyPolygon: empty texture sequence"); bool bOpToDo = false; @@ -960,7 +960,7 @@ namespace cairocanvas //tdf#103026 If the w scaling is 0, then all dashes become zero so //cairo will set the cairo_t status to CAIRO_STATUS_INVALID_DASH //and no further drawing will occur - if (strokeAttributes.DashArray.getLength() > 0 && w > 0.0) + if (strokeAttributes.DashArray.hasElements() && w > 0.0) { auto aDashArray(comphelper::sequenceToContainer<std::vector<double>>(strokeAttributes.DashArray)); for (auto& rDash : aDashArray) diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index b7b7792009e5..113c7541964b 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -54,7 +54,7 @@ namespace cairocanvas SAL_INFO("canvas.cairo", "CairoSpriteCanvas created " << this); // #i64742# Only call initialize when not in probe mode - if( maArguments.getLength() == 0 ) + if( !maArguments.hasElements() ) return; /* maArguments: diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index c9a99621a00d..5e7fca21f61a 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -166,7 +166,7 @@ namespace cairocanvas 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 ], @@ -307,7 +307,7 @@ namespace cairocanvas // TODO(P2): cache that std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]); - if( maLogicalAdvancements.getLength() ) + if( maLogicalAdvancements.hasElements() ) { setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState ); @@ -318,7 +318,7 @@ namespace cairocanvas aSysLayoutData = rOutDev.GetSysTextLayoutData(rOutpos, maText.Text, ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), ::canvas::tools::numeric_cast<sal_uInt16>(maText.Length), - maLogicalAdvancements.getLength() ? aOffsets.get() : nullptr); + maLogicalAdvancements.hasElements() ? aOffsets.get() : nullptr); // Sort them so that all glyphs on the same glyph fallback level are consecutive std::sort(aSysLayoutData.rGlyphData.begin(), aSysLayoutData.rGlyphData.end(), compareFallbacks); @@ -337,7 +337,7 @@ namespace cairocanvas { bCairoRenderable = false; SAL_INFO("canvas.cairo", ":cairocanvas::TextLayout::draw(S,O,p,v,r): VCL FALLBACK " << - (maLogicalAdvancements.getLength() ? "ADV " : "") << + (maLogicalAdvancements.hasElements() ? "ADV " : "") << (aFontData.back().first.bAntialias ? "AA " : "") << (aFontData.back().first.bFakeBold ? "FB " : "") << (aFontData.back().first.bFakeItalic ? "FI " : "") << @@ -352,7 +352,7 @@ namespace cairocanvas // The fallback checks need to be done after final font is known. if (!bCairoRenderable) // VCL FALLBACKS { - if (maLogicalAdvancements.getLength()) // VCL FALLBACK - with glyph advances + if (maLogicalAdvancements.hasElements()) // VCL FALLBACK - with glyph advances { rOutDev.DrawTextArray( rOutpos, maText.Text, aOffsets.get(), ::canvas::tools::numeric_cast<sal_uInt16>(maText.StartPosition), @@ -465,7 +465,7 @@ namespace cairocanvas << (cairo_glyphs.size() > 1 ? cairo_glyphs[1].index : -1) << "," << (cairo_glyphs.size() > 2 ? cairo_glyphs[2].index : -1) - << ") " << (maLogicalAdvancements.getLength() ? "ADV " : "") + << ") " << (maLogicalAdvancements.hasElements() ? "ADV " : "") << (rSysFontData.bAntialias ? "AA " : "") << (rSysFontData.bFakeBold ? "FB " : "") << (rSysFontData.bFakeItalic ? "FI " : "") << " || Name:" |