[Libreoffice-commits] core.git: canvas/source

[Stephan Bergmann (via logerrit)]

 canvas/source/cairo/cairo_spritecanvas.cxx |    2 +-
 canvas/source/vcl/spritecanvas.cxx         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 108d1b7c62bba7220f0e61bba8bb04ccc545bc63
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Oct 5 13:45:14 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Oct 5 16:01:33 2019 +0200

    The checks should apparenty be maArguments.getLength() >= 5
    
    ...given that maArguments[4] is accessed two lines further down, in both cases.
    Looks like typos in b6a7c4da52acf45a7b69d1e81cf9548f8552752e "INTEGRATION: CWS
    canvas05".
    
    Change-Id: Iee8a111126f2b81c9e586fe8e3c569fbd81dd8f4
    Reviewed-on: https://gerrit.libreoffice.org/80289
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index 00ddd6c66cb7..1ec6f7e65810 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -65,7 +65,7 @@ namespace cairocanvas
            4: XWindow for creating Window (or empty for VirtualDevice)
            5: SystemGraphicsData as a streamed Any
          */
-        ENSURE_ARG_OR_THROW( maArguments.getLength() >= 4 &&
+        ENSURE_ARG_OR_THROW( maArguments.getLength() >= 5 &&
                              maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER &&
                              maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE,
                              "CairoSpriteCanvas::initialize: wrong number of arguments, or wrong types" );
diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index 90697dda794d..1a2580f6c852 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -82,7 +82,7 @@ namespace vclcanvas
            4: XWindow for creating Window (or empty for VirtualDevice)
            5: SystemGraphicsData as a streamed Any
          */
-        ENSURE_ARG_OR_THROW( maArguments.getLength() >= 4 &&
+        ENSURE_ARG_OR_THROW( maArguments.getLength() >= 5 &&
                              maArguments[0].getValueTypeClass() == uno::TypeClass_HYPER &&
                              maArguments[4].getValueTypeClass() == uno::TypeClass_INTERFACE,
                              "VCLSpriteCanvas::initialize: wrong number of arguments, or wrong types" );