canvas/source/cairo/cairo_canvasbitmap.cxx | 4 ++-- canvas/source/cairo/cairo_canvasbitmap.hxx | 6 +++--- canvas/source/cairo/cairo_canvashelper.cxx | 4 ++-- canvas/source/vcl/canvasbitmap.hxx | 8 ++++---- canvas/workben/canvasdemo.cxx | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-)
New commits: commit a3525d907e2ae83dcd18ec008db3ae5991130bb4 Author: Noel Grandin <[email protected]> AuthorDate: Mon Sep 1 09:12:06 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Sep 1 10:47:29 2025 +0200 remove some leftover BitmapEx in comments Change-Id: Iaf700486042d2419e024d0d86a842bc3b6da624d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190458 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 376372210c14..09af70bbbb57 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -23,7 +23,7 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/diagnose_ex.hxx> #include <utility> -#include <vcl/bitmapex.hxx> +#include <vcl/bitmap.hxx> #include <vcl/BitmapTools.hxx> #include <cairo.h> @@ -107,7 +107,7 @@ namespace cairocanvas uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) { uno::Any aRV( sal_Int32(0) ); - // 0 ... get BitmapEx + // 0 ... get Bitmap // 1 ... get Pixbuf with bitmap RGB content // 2 ... return nothing (empty Any) switch( nHandle ) diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index f2371821023f..f6f70987e2b2 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -101,12 +101,12 @@ namespace cairocanvas const css::rendering::RenderState& renderState ) override; // XFastPropertySet - // used to retrieve BitmapEx pointer or X Pixmap handles for this bitmap + // used to retrieve Bitmap pointer or X Pixmap handles for this bitmap // handle values have these meanings: - // 0 ... get pointer to BitmapEx + // 0 ... get pointer to Bitmap // 1 ... get X pixmap handle to rgb content // 2 ... FIXME: leftover? ever called with this? always returns nothing (empty Any) - // returned any contains either BitmapEx pointer or array of two Any value + // returned any contains either Bitmap pointer or array of two Any value // 1st a bool value: true - free the pixmap after used by XFreePixmap, false do nothing, the pixmap is used internally in the canvas // 2nd the pixmap handle (sal_Int64) virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override; diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 941068f7b4ad..7de290538cfb 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -43,7 +43,7 @@ #include <cppuhelper/implbase.hxx> #include <rtl/math.hxx> #include <comphelper/diagnose_ex.hxx> -#include <vcl/bitmapex.hxx> +#include <vcl/bitmap.hxx> #include <vcl/BitmapTools.hxx> #include <vcl/canvastools.hxx> #include <vcl/virdev.hxx> @@ -314,7 +314,7 @@ constexpr OUStringLiteral PARAMETRICPOLYPOLYGON_IMPLEMENTATION_NAME = u"Canvas:: // TODO(F1): extract pixel from XBitmap interface ENSURE_OR_THROW( false, - "bitmapFromXBitmap(): could not extract BitmapEx" ); + "bitmapFromXBitmap(): could not extract Bitmap" ); return ::Bitmap(); } diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 7a792d1aa763..2e30956f17fd 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/rendering/XIntegerBitmap.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> -#include <vcl/bitmapex.hxx> +#include <vcl/bitmap.hxx> #include <base/bitmapcanvasbase.hxx> #include <base/basemutexhelper.hxx> @@ -94,12 +94,12 @@ namespace vclcanvas ::Bitmap getBitmap() const; // XFastPropertySet - // used to retrieve BitmapEx pointer or X Pixmap handles for this bitmap + // used to retrieve Bitmap pointer or X Pixmap handles for this bitmap // handle values have these meanings: - // 0 ... get pointer to BitmapEx + // 0 ... get pointer to Bitmap // 1 ... get X pixmap handle to rgb content // 2 ... get X pixmap handle to alpha mask - // returned any contains either BitmapEx pointer or array of three Any value + // returned any contains either Bitmap pointer or array of three Any value // 1st a bool value: true - free the pixmap after used by XFreePixmap, false do nothing, the pixmap is used internally in the canvas // 2nd the pixmap handle (sal_Int64) // 3rd the pixmap depth diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index 5abd99b63041..fcb16f3298fc 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -350,12 +350,12 @@ class DemoRenderer // mxCanvas->drawBitmap(xBitmap2, maViewState, maRenderState); //yes, but where? //cairo-canvas says: //called CanvasHelper::getScaledBitmap, we return NULL, TODO - //Exception 'BitmapEx vclcanvastools::bitmapExFromXBitmap(const css::uno::Reference<css::rendering::XBitmap>&), - //bitmapExFromXBitmap(): could not extract BitmapEx' thrown + //Exception 'Bitmap vclcanvastools::bitmapFromXBitmap(const css::uno::Reference<css::rendering::XBitmap>&), + //bitmapFromXBitmap(): could not extract Bitmap' thrown //vcl-canvas says: - //Exception 'BitmapEx vclcanvastools::bitmapExFromXBitmap(const css::uno::Reference<css::rendering::XBitmap>&), - //bitmapExFromXBitmap(): could not extract bitmap' thrown + //Exception 'Bitmap vclcanvastools::bitmapFromXBitmap(const css::uno::Reference<css::rendering::XBitmap>&), + //bitmapFromXBitmap(): could not extract bitmap' thrown // Thorsten says that this is a bug, and Thorsten never lies. maRenderState = std::move(aOldRenderState); // pop
